权限问题修改

zd-modules/zd-security/src/main/java/com/zd/security/controller/DataStatisticsController.java

@@ -101,7 +101,7 @@ public class DataStatisticsController extends AbstractController {
     @GetMapping(value = "/subList")
     public ResultData subList(CheckManageBo bo) {
         List<Long> users = DataPermissionAspect.threadLocal.get();
-        if(!users.isEmpty()){
+        if(users!=null && !users.isEmpty()){
             bo.setUserIds(users.stream().toArray(Long[]::new));
             DataPermissionAspect.threadLocal.remove();
         }
@@ -188,7 +188,7 @@ public class DataStatisticsController extends AbstractController {
     @GetMapping(value = "/subListTop")
     public ResultData subListTop(CheckManageBo bo) {
         List<Long> users = DataPermissionAspect.threadLocal.get();
-        if(!users.isEmpty()){
+        if(users!=null && !users.isEmpty()){
             bo.setUserIds(users.stream().toArray(Long[]::new));
             DataPermissionAspect.threadLocal.remove();
         }
@@ -386,7 +386,7 @@ public class DataStatisticsController extends AbstractController {
     public ResultData hazardList(CheckHazardBo hazardBo) {
         // 获取数据
         List<Long> users = DataPermissionAspect.threadLocal.get();
-        if(!users.isEmpty()){
+        if(users!=null && !users.isEmpty()){
             hazardBo.setUserIds(users.stream().toArray(Long[]::new));
             DataPermissionAspect.threadLocal.remove();
         }
@@ -410,7 +410,7 @@ public class DataStatisticsController extends AbstractController {
     public ResultData hazardListTop(CheckHazardBo hazardBo) {
         // 获取数据
         List<Long> users = DataPermissionAspect.threadLocal.get();
-        if(!users.isEmpty()){
+        if(users!=null && !users.isEmpty()){
             hazardBo.setUserIds(users.stream().toArray(Long[]::new));
             DataPermissionAspect.threadLocal.remove();
         }
@@ -486,7 +486,7 @@ public class DataStatisticsController extends AbstractController {
     @PostMapping(value = "/hazardExport")
     public void hazardExport(HttpServletResponse response, CheckHazardBo hazardBo) throws IOException {
         List<Long> users = DataPermissionAspect.threadLocal.get();
-        if(!users.isEmpty()){
+        if(users!=null && !users.isEmpty()){
             hazardBo.setUserIds(users.stream().toArray(Long[]::new));
             DataPermissionAspect.threadLocal.remove();
         }
@@ -541,7 +541,7 @@ public class DataStatisticsController extends AbstractController {
     @GetMapping(value = "/contentList")
     public ResultData contentList(CheckHazardBo hazardBo) {
         List<Long> users = DataPermissionAspect.threadLocal.get();
-        if(!users.isEmpty()){
+        if(users!=null && !users.isEmpty()){
             hazardBo.setUserIds(users.stream().toArray(Long[]::new));
             DataPermissionAspect.threadLocal.remove();
         }
@@ -562,7 +562,7 @@ public class DataStatisticsController extends AbstractController {
     @GetMapping(value = "/hazardContentTop")
     public ResultData hazardContenttTop(CheckHazardBo hazardBo) {
         List<Long> users = DataPermissionAspect.threadLocal.get();
-        if(!users.isEmpty()){
+        if(users!=null && !users.isEmpty()){
             hazardBo.setUserIds(users.stream().toArray(Long[]::new));
             DataPermissionAspect.threadLocal.remove();
         }
@@ -625,7 +625,7 @@ public class DataStatisticsController extends AbstractController {
     @PostMapping(value = "/contentExport")
     public void contentExport(HttpServletResponse response, CheckHazardBo hazardBo) throws IOException {
         List<Long> users = DataPermissionAspect.threadLocal.get();
-        if(!users.isEmpty()){
+        if(users!=null && !users.isEmpty()){
             hazardBo.setUserIds(users.stream().toArray(Long[]::new));
             DataPermissionAspect.threadLocal.remove();
         }
@@ -633,7 +633,7 @@ public class DataStatisticsController extends AbstractController {
         //查询检查内容危险源总数
         QueryWrapper<CheckHazard> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(CheckHazard::getCheckCategory, 2);
-        if(!users.isEmpty()){
+        if(users!=null && !users.isEmpty()){
             queryWrapper.lambda().in(CheckHazard::getCreateBy,users);
         }
 
@@ -778,7 +778,7 @@ public class DataStatisticsController extends AbstractController {
     public ResultData itemsListTitle(CheckHazardBo hazardBo) {
         // 获取数据
         List<Long> users = DataPermissionAspect.threadLocal.get();
-        if(!users.isEmpty()){
+        if(users!=null && !users.isEmpty()){
             hazardBo.setUserIds(users.stream().toArray(Long[]::new));
             DataPermissionAspect.threadLocal.remove();
         }
@@ -848,7 +848,7 @@ public class DataStatisticsController extends AbstractController {
     @PostMapping(value = "/itemsExport")
     public void itemsExport(HttpServletResponse response, CheckHazardBo hazardBo) throws IOException {
         List<Long> users = DataPermissionAspect.threadLocal.get();
-        if(!users.isEmpty()){
+        if(users!=null && !users.isEmpty()){
             hazardBo.setUserIds(users.stream().toArray(Long[]::new));
             DataPermissionAspect.threadLocal.remove();
         }
@@ -1434,7 +1434,7 @@ public class DataStatisticsController extends AbstractController {
     @GetMapping(value = "/groupHazard")
     public TableDataInfo groupHazard(CheckHazardBo bo) {
         List<Long> users = DataPermissionAspect.threadLocal.get();
-        if(!users.isEmpty()){
+        if(users!=null && !users.isEmpty()){
             bo.setUserIds(users.stream().toArray(Long[]::new));
             DataPermissionAspect.threadLocal.remove();
         }
@@ -1452,7 +1452,7 @@ public class DataStatisticsController extends AbstractController {
     @GetMapping(value = "/groupSub")
     public TableDataInfo groupSub(CheckHazardBo bo) {
         List<Long> users = DataPermissionAspect.threadLocal.get();
-        if(!users.isEmpty()){
+        if(users!=null && !users.isEmpty()){
             bo.setUserIds(users.stream().toArray(Long[]::new));
             DataPermissionAspect.threadLocal.remove();
         }
@@ -1478,7 +1478,7 @@ public class DataStatisticsController extends AbstractController {
     @GetMapping(value = "/hazardSubList")
     public ResultData hazardSubList(CheckHazardBo bo) {
         List<Long> users = DataPermissionAspect.threadLocal.get();
-        if(!users.isEmpty()){
+        if(users!=null && !users.isEmpty()){
             bo.setUserIds(users.stream().toArray(Long[]::new));
             DataPermissionAspect.threadLocal.remove();
         }

zd-modules/zd-security/src/main/java/com/zd/security/controller/WorkCollegeController.java

@@ -476,7 +476,7 @@ public class WorkCollegeController extends AbstractController {
     public  ResultData hiddenDataItemsSubList(CheckHazardBo hazardBo) {
 
         List<Long> users = DataPermissionAspect.threadLocal.get();
-        if(!users.isEmpty()){
+        if(users!=null && !users.isEmpty()){
             hazardBo.setUserIds(users.stream().toArray(Long[]::new));
             DataPermissionAspect.threadLocal.remove();
         }
@@ -505,7 +505,7 @@ public class WorkCollegeController extends AbstractController {
     @GetMapping(value = "/hiddenDataItemsSubListTop")
     public  ResultData hiddenDataItemsSubListTop(CheckHazardBo hazardBo) {
         List<Long> users = DataPermissionAspect.threadLocal.get();
-        if(!users.isEmpty()){
+        if(users!=null && !users.isEmpty()){
             hazardBo.setUserIds(users.stream().toArray(Long[]::new));
             DataPermissionAspect.threadLocal.remove();
         }
@@ -576,7 +576,7 @@ public class WorkCollegeController extends AbstractController {
     @PostMapping(value = "/collegeItemsExport")
     public void itemsExport(HttpServletResponse response, CheckHazardBo hazardBo) throws IOException {
         List<Long> users = DataPermissionAspect.threadLocal.get();
-        if(!users.isEmpty()){
+        if(users!=null && !users.isEmpty()){
             hazardBo.setUserIds(users.stream().toArray(Long[]::new));
             DataPermissionAspect.threadLocal.remove();
         }

zd-modules/zd-security/src/main/java/com/zd/security/controller/WorkSchoolController.java

@@ -68,9 +68,6 @@ public class WorkSchoolController extends AbstractController {
     @Autowired
     private CheckMemberService checkMemberService;
 
-    @Autowired
-    private CheckPlanService checkPlanService;
-
 
     /***
      * 院校巡查