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 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 page = new Page(pageNo, pageSize); IPage 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 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 page = new Page(pageNo, pageSize); IPage pageList = personalCompTotalScoreService.page(page, queryWrapper); return Result.OK(pageList);