diff --git a/src/main/java/com/lz/config/ShiroConfig.java b/src/main/java/com/lz/config/ShiroConfig.java index 292daac3..677f5e88 100644 --- a/src/main/java/com/lz/config/ShiroConfig.java +++ b/src/main/java/com/lz/config/ShiroConfig.java @@ -54,6 +54,7 @@ public class ShiroConfig { filterMap.put("/file/**", "anon"); filterMap.put("/test/**", "anon"); filterMap.put("/druid/**", "anon"); + filterMap.put("/user/lzresultrecord/new/resultRecordDetail/**", "anon"); filterMap.put("/app/**", "anon"); filterMap.put("/sys/login", "anon"); filterMap.put("/sys/sendSMS", "anon"); diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index 218e071c..40e6aa0d 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -1091,7 +1091,7 @@ public class ResultRecordController extends AbstractController { * * 删除 */ - // http://localhost:8080/lz_management/user/lzresultrecord/new/resultRecordDetail?resultRecordId=491&loginUserId=408 + // http://localhost:8080/lz_management/user/lzresultrecord/new/resultRecordDetail?resultRecordId=593&loginUserId=322 @RequestMapping("/new/resultRecordDetail") public R newResultRecordList(RecordDetailDto recordDetailDto) { if(recordDetailDto.getLoginUserId() ==null && getUser() !=null ){ diff --git a/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java index c0319d69..e6e35b49 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java @@ -184,7 +184,7 @@ public class ChartResultServiceImpl implements ChartResultService { public PageUtils selectChartDetailList(ChartResultReq req) { List allDeparmentIds = staffService.selectAllDeparmentIdsByDepartmentParentId(req.getDepartmentId()); //自己管理的和所有的部门交集 - log.info("selectChartDetailList 管理部门:" + JSON.toJSONString(allDeparmentIds)); + log.info("selectChartDetailList 查询部门:" + JSON.toJSONString(allDeparmentIds)); List mandepartmentIds = assessService.roleDepartments(req.getLoginUserId()); if(mandepartmentIds!=null ){ if(mandepartmentIds.size()==0){ @@ -196,9 +196,14 @@ public class ChartResultServiceImpl implements ChartResultService { return new PageUtils(); } } + else { + //如果掌管所有部门,查询请求部门 + mandepartmentIds = allDeparmentIds; + } log.info("selectChartDetailList 交集部门:" + JSON.toJSONString(mandepartmentIds)); + List finalMandepartmentIds = mandepartmentIds; PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(), req.getPageSize()).doSelect( - page -> resultRecordMapper.selectChartDetailList(page,mandepartmentIds,req.getStartId(),req.getScoreLevel()) + page -> resultRecordMapper.selectChartDetailList(page, finalMandepartmentIds,req.getStartId(),req.getScoreLevel()) ); return pageUtils; } diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java index 5112cd8d..117aabf5 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java @@ -1198,8 +1198,8 @@ public class ResultRecordServiceImpl extends ServiceImpl