diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java index 91c89f8d2..3b16afe41 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java @@ -392,8 +392,9 @@ public class NcrTrackServiceImpl extends ServiceImpl trackVOList = parameterQuery(ncrTrackVO, trackVOList); //表头排序 heartSort(ncrTrackVO, trackVOList); - - + for (NcrTrackVO trackVO : trackVOList) { + trackVO.setAdministrator(administrator ? "true" : "false"); + } return trackVOList; } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index d68ac9d55..7acebb8ff 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -10248,6 +10248,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl> queryNotComplianList(Map params) { + //如果当前登录用户是系统管理员角色,可以查看所有的数据 + boolean administrator = this.sysUserService.isAdministrator(); String cut = (String) params.get("cut"); List complianceFlowStatusList = new ArrayList<>(); @@ -10311,6 +10313,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl