From d4953de233d3027f705a0e438fd12d45d0c595e3 Mon Sep 17 00:00:00 2001
From: fhv <flymail1987@126.com>
Date: Tue, 30 Jul 2024 21:56:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E7=A7=AF=E5=88=86=E3=80=81?=
 =?UTF-8?q?=E8=83=BD=E5=8A=9B=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PersonalAbilityEvaluationCollectController.java       | 8 +++++++-
 .../controller/PersonalCompTotalScoreController.java      | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/controller/PersonalAbilityEvaluationCollectController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/controller/PersonalAbilityEvaluationCollectController.java
index 92023f49..03aa9923 100644
--- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/controller/PersonalAbilityEvaluationCollectController.java
+++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/controller/PersonalAbilityEvaluationCollectController.java
@@ -13,6 +13,8 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.demo.abilityEvaluation.entity.PersonalAbilityEvaluationCollect;
 import org.jeecg.modules.demo.abilityEvaluation.service.IPersonalAbilityEvaluationCollectService;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -35,6 +37,9 @@ public class PersonalAbilityEvaluationCollectController extends JeecgController<
     @Autowired
     private IPersonalAbilityEvaluationCollectService personalAbilityEvaluationCollectService;
 
+    @Autowired
+    private ISysUserService iSysUserService;
+
     /**
      * 分页列表查询
      *
@@ -76,7 +81,8 @@ public class PersonalAbilityEvaluationCollectController extends JeecgController<
                                                                          HttpServletRequest req) {
         QueryWrapper<PersonalAbilityEvaluationCollect> queryWrapper = QueryGenerator.initQueryWrapper(personalAbilityEvaluationCollect, req.getParameterMap());
         LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        queryWrapper.eq("work_on",user.getUsername());
+        SysUser user1 = iSysUserService.getById(user.getId());
+        queryWrapper.eq("work_on",user1.getWorkNo());
         Page<PersonalAbilityEvaluationCollect> page = new Page<PersonalAbilityEvaluationCollect>(pageNo, pageSize);
         IPage<PersonalAbilityEvaluationCollect> pageList = personalAbilityEvaluationCollectService.page(page, queryWrapper);
         return Result.OK(pageList);
diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/controller/PersonalCompTotalScoreController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/controller/PersonalCompTotalScoreController.java
index 8c34e5ff..5b142d59 100644
--- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/controller/PersonalCompTotalScoreController.java
+++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/controller/PersonalCompTotalScoreController.java
@@ -15,6 +15,8 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.demo.annualScore.entity.PersonalCompTotalScore;
 import org.jeecg.modules.demo.annualScore.service.IPersonalCompTotalScoreService;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -37,6 +39,9 @@ public class PersonalCompTotalScoreController extends JeecgController<PersonalCo
     @Autowired
     private IPersonalCompTotalScoreService personalCompTotalScoreService;
 
+    @Autowired
+    private ISysUserService iSysUserService;
+
     /**
      * 分页列表查询
      *
@@ -79,7 +84,8 @@ public class PersonalCompTotalScoreController extends JeecgController<PersonalCo
                                                                HttpServletRequest req) {
         QueryWrapper<PersonalCompTotalScore> queryWrapper = QueryGenerator.initQueryWrapper(personalCompTotalScore, req.getParameterMap());
         LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        queryWrapper.eq("work_on",user.getUsername());
+        SysUser user1 = iSysUserService.getById(user.getId());
+        queryWrapper.eq("work_on",user1.getWorkNo());
         Page<PersonalCompTotalScore> page = new Page<PersonalCompTotalScore>(pageNo, pageSize);
         IPage<PersonalCompTotalScore> pageList = personalCompTotalScoreService.page(page, queryWrapper);
         return Result.OK(pageList);