权限问题修改

zd-api/zd-security-api/src/main/java/com/zd/security/api/bo/CheckManageBo.java

@@ -42,6 +42,9 @@ public class CheckManageBo extends PageQuery implements Serializable {
     @ApiModelProperty("实验室id列表")
     private String subIds;
 
+    @ApiModelProperty("实验室id集合")
+    private Long[] subListIds;
+
     @ApiModelProperty("计划标题")
     private String title;
 
@@ -144,6 +147,9 @@ public class CheckManageBo extends PageQuery implements Serializable {
     @ApiModelProperty("是否与我有关 0否 1是")
     private Integer myRelated;
 
+    @ApiModelProperty("用户集合id")
+    private Long[] userIds;
+
     /**
      * 登录用户名称
      */

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

@@ -28,6 +28,7 @@ import com.zd.security.api.bo.CheckManageBo;
 import com.zd.security.api.vo.*;
 import com.zd.security.entity.*;
 import com.zd.security.scope.DataPermission;
+import com.zd.security.scope.DataPermissionAspect;
 import com.zd.security.service.*;
 import com.zd.system.api.feign.RemoteDeptService;
 import com.zd.system.api.feign.RemoteUserService;
@@ -46,8 +47,6 @@ import java.io.IOException;
 import java.time.LocalDate;
 import java.time.temporal.TemporalAdjusters;
 import java.util.*;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Collectors;
 
 /**
@@ -60,8 +59,6 @@ import java.util.stream.Collectors;
 @RequestMapping("/DataStatistics")
 public class DataStatisticsController extends AbstractController {
 
-    private Lock lock = new ReentrantLock();
-
     @Autowired
     private CheckHazardService checkHazardService;
 
@@ -98,23 +95,21 @@ public class DataStatisticsController extends AbstractController {
     @Value("${check.manageSign}")
     private String manageSign;
 
+    @DataPermission()
     @PreAuthorize(hasPermi = PerPrefix.SECURITY_DATA_SUB + PerFun.LIST)
     @ApiOperation("实验室列表")
     @GetMapping(value = "/subList")
     public ResultData subList(CheckManageBo bo) {
+        List<Long> users = DataPermissionAspect.threadLocal.get();
+        if(!users.isEmpty()){
+            bo.setUserIds(users.stream().toArray(Long[]::new));
+            DataPermissionAspect.threadLocal.remove();
+        }
         Page<CheckManageVo> page = new Page<>(bo.getPageNum(), bo.getPageSize());
         return ResultData.success(getSubList(page, bo));
     }
 
     private Page<CheckManageVo> getSubList(Page page, CheckManageBo bo) {
-        /*****
-         *deptId 部门id
-         *typeId 安全分类id
-         *level 安全分级id
-         *searchValue
-         *beginTime 开始时间
-         * endTime 结束时间
-         */
         Page<CheckManageVo> list = checkManageService.selecSubCheckManageList(page, bo);
         if (list != null && list.getRecords().size() > 0) {
             Long[] ids = list.getRecords().stream().map(a -> a.getSubId()).toArray(Long[]::new);
@@ -187,10 +182,16 @@ public class DataStatisticsController extends AbstractController {
      * @param bo
      * @return
      */
+    @DataPermission()
     @PreAuthorize(hasPermi = PerPrefix.SECURITY_DATA_SUB + PerFun.LIST)
     @ApiOperation("实验室列表头部数据统计")
     @GetMapping(value = "/subListTop")
     public ResultData subListTop(CheckManageBo bo) {
+        List<Long> users = DataPermissionAspect.threadLocal.get();
+        if(!users.isEmpty()){
+            bo.setUserIds(users.stream().toArray(Long[]::new));
+            DataPermissionAspect.threadLocal.remove();
+        }
         return ResultData.success(getSubListTop(bo));
     }
 
@@ -316,13 +317,14 @@ public class DataStatisticsController extends AbstractController {
     /**
      * 数据统计-按实验室导出
      */
+    @DataPermission()
     @PreAuthorize(hasPermi = PerPrefix.SECURITY_DATA_SUB + PerFun.EXPORT)
     @Log(title = "数据统计-按实验室导出", businessType = BusinessType.EXPORT)
     @PostMapping("/subExport")
     public void export(HttpServletResponse response, CheckManageBo bo) throws IOException {
         List<SubjectExcel> excelList = new ArrayList<>();
         Page<CheckManageVo> page = new Page().setSize(-1);
-        bo.setDeptIds(bo.getIds());
+        bo.setSubListIds(bo.getIds());
         Page<CheckManageVo> list = getSubList(page, bo);
         if (list != null && list.getRecords().size() > 0) {
             for (CheckManageVo vo : list.getRecords()) {
@@ -378,20 +380,20 @@ public class DataStatisticsController extends AbstractController {
      * @return
      */
     @PreAuthorize(hasPermi = PerPrefix.SECURITY_DATA_SUB + PerFun.LIST)
-    @DataPermission(tableAlias = "m")
+    @DataPermission()
     @ApiOperation("安全隐患列表")
     @GetMapping(value = "/hazardList")
     public ResultData hazardList(CheckHazardBo hazardBo) {
-        /***
-         * deptId 学院id
-         * rectifyStatus 整改状态  1是已完成，2是待整改，3是待复核，4是暂无法整改
-         * hdLevel 隐患等级 1重大隐患，2是一般隐患,3管理问题
-         * searchValue 搜索值
-         * beginTime 开始时间
-         * endTime  结束时间
-         */
+        // 获取数据
+        List<Long> users = DataPermissionAspect.threadLocal.get();
+        if(!users.isEmpty()){
+            hazardBo.setUserIds(users.stream().toArray(Long[]::new));
+            DataPermissionAspect.threadLocal.remove();
+        }
+
         Page<CheckHazardBo> page = new Page<>(hazardBo.getPageNum(), hazardBo.getPageSize());
-        hazardBo.setAppFlag(1);//排序标识
+        //排序标识
+        hazardBo.setAppFlag(1);
         Page<CheckHazardVo> list = checkHazardService.hiddenDataStatisticsList(page, hazardBo);
         return ResultData.success(list);
     }
@@ -402,10 +404,16 @@ public class DataStatisticsController extends AbstractController {
      * @return
      */
     @PreAuthorize(hasPermi = PerPrefix.SECURITY_DATA_SUB + PerFun.LIST)
-    @DataPermission(tableAlias = "m")
+    @DataPermission()
     @ApiOperation("安全隐患列表头部数据统计")
     @GetMapping(value = "/hazardListTop")
     public ResultData hazardListTop(CheckHazardBo hazardBo) {
+        // 获取数据
+        List<Long> users = DataPermissionAspect.threadLocal.get();
+        if(!users.isEmpty()){
+            hazardBo.setUserIds(users.stream().toArray(Long[]::new));
+            DataPermissionAspect.threadLocal.remove();
+        }
         return ResultData.success(getHazardListTop(hazardBo));
     }
 
@@ -472,18 +480,17 @@ public class DataStatisticsController extends AbstractController {
      * @param hazardBo
      * @return
      */
+    @DataPermission()
     @PreAuthorize(hasPermi = PerPrefix.SECURITY_DATA_SUB + PerFun.EXPORT)
     @ApiOperation("安全隐患列表导出")
     @PostMapping(value = "/hazardExport")
     public void hazardExport(HttpServletResponse response, CheckHazardBo hazardBo) throws IOException {
-        /***
-         * deptId 学院id
-         * rectifyStatus 整改状态  1是已完成，2是待整改，3是待复核，4是暂无法整改
-         * hdLevel 隐患等级 1重大隐患，2是一般隐患,3管理问题
-         * searchValue 搜索值
-         * beginTime 开始时间
-         * endTime  结束时间
-         */
+        List<Long> users = DataPermissionAspect.threadLocal.get();
+        if(!users.isEmpty()){
+            hazardBo.setUserIds(users.stream().toArray(Long[]::new));
+            DataPermissionAspect.threadLocal.remove();
+        }
+
         Page<CheckHazardBo> page = new Page().setSize(-1);
         List<HazardExcel> excelList = new ArrayList<>();
         Page<CheckHazardVo> list = checkHazardService.hiddenDataStatisticsList(page, hazardBo);
@@ -529,25 +536,19 @@ public class DataStatisticsController extends AbstractController {
      * @return
      */
     @PreAuthorize(hasPermi = PerPrefix.SECURITY_DATA_SUB + PerFun.LIST)
-    @DataPermission(tableAlias = "m")
-    @ApiOperation("安全隐患列表")
+    @DataPermission()
+    @ApiOperation("检查内容列表")
     @GetMapping(value = "/contentList")
     public ResultData contentList(CheckHazardBo hazardBo) {
-        /*****
-         *hazardTypeMode 危险源类型id
-         *deptId 学院id
-         *subId 实验室id
-         *beginTime 开始时间
-         * endTime 结束时间
-         */
-        lock.lock();
-        try {
-            Page<CheckHazardBo> page = new Page<>(hazardBo.getPageNum(), hazardBo.getPageSize());
-            Page<CheckHazardVo> list = getCountList(page, hazardBo);
-            return ResultData.success(list);
-        } finally {
-            lock.unlock();
+        List<Long> users = DataPermissionAspect.threadLocal.get();
+        if(!users.isEmpty()){
+            hazardBo.setUserIds(users.stream().toArray(Long[]::new));
+            DataPermissionAspect.threadLocal.remove();
         }
+
+        Page<CheckHazardBo> page = new Page<>(hazardBo.getPageNum(), hazardBo.getPageSize());
+        Page<CheckHazardVo> list = getCountList(page, hazardBo);
+        return ResultData.success(list);
     }
 
     /***
@@ -556,16 +557,16 @@ public class DataStatisticsController extends AbstractController {
      * @return
      */
     @PreAuthorize(hasPermi = PerPrefix.SECURITY_DATA_SUB + PerFun.LIST)
-    @DataPermission(tableAlias = "m")
+    @DataPermission()
     @ApiOperation("检查内容列表头部数据统计")
     @GetMapping(value = "/hazardContentTop")
     public ResultData hazardContenttTop(CheckHazardBo hazardBo) {
-        lock.lock();
-        try {
-            return ResultData.success(getHazardContentTop(hazardBo));
-        }finally {
-            lock.unlock();
+        List<Long> users = DataPermissionAspect.threadLocal.get();
+        if(!users.isEmpty()){
+            hazardBo.setUserIds(users.stream().toArray(Long[]::new));
+            DataPermissionAspect.threadLocal.remove();
         }
+        return ResultData.success(getHazardContentTop(hazardBo));
     }
 
     private Map<String, Object> getHazardContentTop(CheckHazardBo hazardBo) {
@@ -623,18 +624,20 @@ public class DataStatisticsController extends AbstractController {
     @ApiOperation("安全隐患列表导出")
     @PostMapping(value = "/contentExport")
     public void contentExport(HttpServletResponse response, CheckHazardBo hazardBo) throws IOException {
-        /*****
-         *hazardTypeMode 危险源类型id
-         *deptId 学院id
-         *subId 实验室id
-         *beginTime 开始时间
-         * endTime 结束时间
-         */
+        List<Long> users = DataPermissionAspect.threadLocal.get();
+        if(!users.isEmpty()){
+            hazardBo.setUserIds(users.stream().toArray(Long[]::new));
+            DataPermissionAspect.threadLocal.remove();
+        }
+
         //查询检查内容危险源总数
         QueryWrapper<CheckHazard> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(CheckHazard::getCheckCategory, 2);
-        Integer total = checkHazardService.list(queryWrapper).size();
+        if(!users.isEmpty()){
+            queryWrapper.lambda().in(CheckHazard::getCreateBy,users);
+        }
 
+        Integer total = checkHazardService.list(queryWrapper).size();
         Page<CheckHazardBo> page = new Page().setSize(-1);
         List<ContentExcel> excelList = new ArrayList<>();
         Page<CheckHazardVo> list = checkHazardService.hiddenDataContentList(page, hazardBo);
@@ -694,13 +697,13 @@ public class DataStatisticsController extends AbstractController {
         String value = null;
         switch (key) {
             case 1:
-                value = "复核完毕";//已整改
+                value = "复核完毕";
                 break;
             case 2:
-                value = "未整改";//待整改
+                value = "未整改";
                 break;
             case 3:
-                value = "已整改";//待复核
+                value = "已整改";
                 break;
             case 4:
                 value = "暂无法整改";
@@ -740,16 +743,17 @@ public class DataStatisticsController extends AbstractController {
      * @return
      */
     @PreAuthorize(hasPermi = PerPrefix.SECURITY_DATA_SUB + PerFun.LIST)
-    @DataPermission(tableAlias = "m")
+    @DataPermission()
     @ApiOperation("安全指标列表")
     @GetMapping(value = "/itemsList")
     public ResultData itemsList(CheckHazardBo hazardBo) {
-        /***
-         * deptId 学院id
-         * searchValue 搜索值
-         * beginTime 开始时间
-         * endTime  结束时间
-         */
+        // 获取数据
+        List<Long> users = DataPermissionAspect.threadLocal.get();
+        if(users.isEmpty()){
+            hazardBo.setUserIds(users.stream().toArray(Long[]::new));
+            DataPermissionAspect.threadLocal.remove();
+        }
+
         Page<CheckHazardVo> list = checkHazardService.hiddenDataItemsList(hazardBo);
         if (list.getRecords().size() > 0) {
             for (CheckHazardVo vo : list.getRecords()) {
@@ -768,10 +772,16 @@ public class DataStatisticsController extends AbstractController {
      * @return
      */
     @PreAuthorize(hasPermi = PerPrefix.SECURITY_DATA_SUB + PerFun.LIST)
-    @DataPermission(tableAlias = "m")
+    @DataPermission()
     @ApiOperation("安全指标列表头部统计")
     @GetMapping(value = "/itemsListTop")
     public ResultData itemsListTitle(CheckHazardBo hazardBo) {
+        // 获取数据
+        List<Long> users = DataPermissionAspect.threadLocal.get();
+        if(!users.isEmpty()){
+            hazardBo.setUserIds(users.stream().toArray(Long[]::new));
+            DataPermissionAspect.threadLocal.remove();
+        }
         return ResultData.success(getItemsListTop(hazardBo));
     }
 
@@ -832,17 +842,17 @@ public class DataStatisticsController extends AbstractController {
      * @param hazardBo
      * @return
      */
+    @DataPermission()
     @PreAuthorize(hasPermi = PerPrefix.SECURITY_DATA_SUB + PerFun.EXPORT)
     @ApiOperation("安全指标列表导出")
     @PostMapping(value = "/itemsExport")
     public void itemsExport(HttpServletResponse response, CheckHazardBo hazardBo) throws IOException {
-        /***
-         * deptId 学院id
-         * subId 实验室id
-         * searchValue 搜索值
-         * beginTime 开始时间
-         * endTime  结束时间
-         */
+        List<Long> users = DataPermissionAspect.threadLocal.get();
+        if(!users.isEmpty()){
+            hazardBo.setUserIds(users.stream().toArray(Long[]::new));
+            DataPermissionAspect.threadLocal.remove();
+        }
+
         List<ItemsExcel> excelList = new ArrayList<>();
         Page<CheckHazardVo> list = checkHazardService.hiddenDataItemsList(hazardBo);
         if (list.getRecords().size() > 0) {
@@ -1419,9 +1429,15 @@ public class DataStatisticsController extends AbstractController {
      * @param bo
      * @return
      */
+    @DataPermission()
     @ApiOperation("安全隐患统计-按指标分组")
     @GetMapping(value = "/groupHazard")
     public TableDataInfo groupHazard(CheckHazardBo bo) {
+        List<Long> users = DataPermissionAspect.threadLocal.get();
+        if(!users.isEmpty()){
+            bo.setUserIds(users.stream().toArray(Long[]::new));
+            DataPermissionAspect.threadLocal.remove();
+        }
         PageHelper.startPage(bo.getPageNum(), bo.getPageSize());
         return getDataTable(checkHazardService.groupByHazard(bo));
     }
@@ -1431,9 +1447,15 @@ public class DataStatisticsController extends AbstractController {
      * @param bo
      * @return
      */
+    @DataPermission()
     @ApiOperation("安全隐患统计-按实验室分组")
     @GetMapping(value = "/groupSub")
     public TableDataInfo groupSub(CheckHazardBo bo) {
+        List<Long> users = DataPermissionAspect.threadLocal.get();
+        if(!users.isEmpty()){
+            bo.setUserIds(users.stream().toArray(Long[]::new));
+            DataPermissionAspect.threadLocal.remove();
+        }
         return getDataTable(checkHazardService.groupBySub(bo));
     }
 
@@ -1451,9 +1473,15 @@ public class DataStatisticsController extends AbstractController {
      * 数据大屏 安全隐患统计 检查项、实验室分组列表
      * @return
      */
+    @DataPermission()
     @ApiOperation("安全隐患指标、实验室列表")
     @GetMapping(value = "/hazardSubList")
     public ResultData hazardSubList(CheckHazardBo bo) {
+        List<Long> users = DataPermissionAspect.threadLocal.get();
+        if(!users.isEmpty()){
+            bo.setUserIds(users.stream().toArray(Long[]::new));
+            DataPermissionAspect.threadLocal.remove();
+        }
         Page<CheckHazardBo> page = new Page<>(bo.getPageNum(), bo.getPageSize());
         return ResultData.success(checkHazardService.groupBySubAndOption(page, bo));
     }

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

@@ -24,6 +24,7 @@ import com.zd.security.api.vo.CheckManageVo;
 import com.zd.security.api.vo.CollegeItemsExcel;
 import com.zd.security.entity.CheckManage;
 import com.zd.security.scope.DataPermission;
+import com.zd.security.scope.DataPermissionAspect;
 import com.zd.security.service.CheckHazardService;
 import com.zd.security.service.CheckManageService;
 import com.zd.system.api.feign.RemoteDeptService;
@@ -77,6 +78,7 @@ public class WorkCollegeController extends AbstractController {
      * 院校巡查
      * @return
      */
+    @DataPermission()
     @ApiOperation("院校巡查")
     @GetMapping(value = "/check")
     public ResultData schoolCheck() {
@@ -468,26 +470,27 @@ public class WorkCollegeController extends AbstractController {
      * @return
      */
     @PreAuthorize(hasPermi = PerPrefix.SECURITY_DATA_SUB + PerFun.LIST)
-    @DataPermission(tableAlias = "m")
+    @DataPermission()
     @ApiOperation("检查指标隐患项统计")
     @GetMapping(value = "/hiddenDataItemsSubList")
     public  ResultData hiddenDataItemsSubList(CheckHazardBo hazardBo) {
-        lock.lock();
-        try {
-            Page<CheckHazardVo> page = new Page<>(hazardBo.getPageNum(),hazardBo.getPageSize());
-            Page<CheckHazardVo>  list = checkHazardService.hiddenDataItemsSubList(page,hazardBo);
-            if (!list.getRecords().isEmpty() && list.getRecords().size() > 0) {
-                for (CheckHazardVo vo : list.getRecords()) {
-                    vo.setPercent(WorkSchoolController.myPercent(vo.getItemsTotal1(), vo.getSchoolItemsTotal1(), "##.##%"));
-                    vo.setPercent2(WorkSchoolController.myPercent(vo.getItemsTotal2(), vo.getSchoolItemsTotal2(), "##.##%"));
-                    vo.setPercent3(WorkSchoolController.myPercent(vo.getItemsTotal3(), vo.getSchoolItemsTotal3(), "##.##%"));
-                    vo.setPercent4(WorkSchoolController.myPercent(vo.getItemsTotal4(), vo.getSchoolItemsTotal4(), "##.##%"));
-                }
+
+        List<Long> users = DataPermissionAspect.threadLocal.get();
+        if(!users.isEmpty()){
+            hazardBo.setUserIds(users.stream().toArray(Long[]::new));
+            DataPermissionAspect.threadLocal.remove();
+        }
+        Page<CheckHazardVo> page = new Page<>(hazardBo.getPageNum(),hazardBo.getPageSize());
+        Page<CheckHazardVo>  list = checkHazardService.hiddenDataItemsSubList(page,hazardBo);
+        if (!list.getRecords().isEmpty() && list.getRecords().size() > 0) {
+            for (CheckHazardVo vo : list.getRecords()) {
+                vo.setPercent(WorkSchoolController.myPercent(vo.getItemsTotal1(), vo.getSchoolItemsTotal1(), "##.##%"));
+                vo.setPercent2(WorkSchoolController.myPercent(vo.getItemsTotal2(), vo.getSchoolItemsTotal2(), "##.##%"));
+                vo.setPercent3(WorkSchoolController.myPercent(vo.getItemsTotal3(), vo.getSchoolItemsTotal3(), "##.##%"));
+                vo.setPercent4(WorkSchoolController.myPercent(vo.getItemsTotal4(), vo.getSchoolItemsTotal4(), "##.##%"));
             }
-            return ResultData.success(list);
-        }finally {
-            lock.unlock();
         }
+        return ResultData.success(list);
     }
 
 
@@ -497,16 +500,16 @@ public class WorkCollegeController extends AbstractController {
      * @return
      */
     @PreAuthorize(hasPermi = PerPrefix.SECURITY_DATA_SUB + PerFun.LIST)
-    @DataPermission(tableAlias = "m")
+    @DataPermission()
     @ApiOperation("检查指标隐患项统计")
     @GetMapping(value = "/hiddenDataItemsSubListTop")
     public  ResultData hiddenDataItemsSubListTop(CheckHazardBo hazardBo) {
-        lock.lock();
-        try {
-            return ResultData.success(getHiddenDataItemsSubListTop(hazardBo));
-        }finally {
-            lock.unlock();
+        List<Long> users = DataPermissionAspect.threadLocal.get();
+        if(!users.isEmpty()){
+            hazardBo.setUserIds(users.stream().toArray(Long[]::new));
+            DataPermissionAspect.threadLocal.remove();
         }
+        return ResultData.success(getHiddenDataItemsSubListTop(hazardBo));
     }
 
 
@@ -567,10 +570,16 @@ public class WorkCollegeController extends AbstractController {
      * @param hazardBo
      * @throws IOException
      */
+    @DataPermission()
     @PreAuthorize(hasPermi = PerPrefix.SECURITY_DATA_SUB + PerFun.EXPORT)
     @ApiOperation("院级安全指标列表导出")
     @PostMapping(value = "/collegeItemsExport")
     public void itemsExport(HttpServletResponse response, CheckHazardBo hazardBo) throws IOException {
+        List<Long> users = DataPermissionAspect.threadLocal.get();
+        if(!users.isEmpty()){
+            hazardBo.setUserIds(users.stream().toArray(Long[]::new));
+            DataPermissionAspect.threadLocal.remove();
+        }
         List<CollegeItemsExcel> excelList = new ArrayList<>();
         Page<CheckHazardVo> page = new Page().setSize(-1);
         Page<CheckHazardVo> list = checkHazardService.hiddenDataItemsSubList(page,hazardBo);

zd-modules/zd-security/src/main/java/com/zd/security/mapper/CheckHazardMapper.java

@@ -48,13 +48,10 @@ public interface CheckHazardMapper extends BaseMapper<CheckHazard> {
 
     public Page <CheckHazardVo> hiddenDataItemsList(@Param("page") Page page,@Param("checkHazardBo")  CheckHazardBo checkHazardBo );
 
-    @DataPermission(tableAlias = "m")
     public Page <CheckHazardVo> hiddenDataItemsSubList(@Param("page") Page page,@Param("checkHazardBo")  CheckHazardBo checkHazardBo);
 
-    @DataPermission(tableAlias = "m")
     Page <CheckHazardVo> hiddenDataContentList(@Param("page") Page page,@Param("bo")  CheckHazardBo checkHazardBo);
 
-    @DataPermission(tableAlias = "m")
     public List <CheckHazardVo> hiddenDataItemsSubListTop(CheckHazardBo checkHazardBo);
 
     public Integer countHazardNum(CheckHazardBo checkHazardBo);
@@ -75,7 +72,6 @@ public interface CheckHazardMapper extends BaseMapper<CheckHazard> {
      * @param checkHazardBo
      * @return
      */
-    @DataPermission(tableAlias = "h")
     List<CheckHazardVo> groupByHazard(CheckHazardBo checkHazardBo);
 
     /**
@@ -83,7 +79,6 @@ public interface CheckHazardMapper extends BaseMapper<CheckHazard> {
      * @param checkHazardBo
      * @return
      */
-    @DataPermission(tableAlias = "m")
     List<CheckHazardVo> groupBySub(CheckHazardBo checkHazardBo);
 
     /**
@@ -91,7 +86,6 @@ public interface CheckHazardMapper extends BaseMapper<CheckHazard> {
      * @param checkHazardBo
      * @return
      */
-    @DataPermission(tableAlias = "h")
     Page <CheckHazardVo> groupBySubAndOption(@Param("page") Page page,@Param("bo")  CheckHazardBo checkHazardBo);
 
     /**

zd-modules/zd-security/src/main/java/com/zd/security/mapper/CheckManageMapper.java

@@ -43,6 +43,5 @@ public interface CheckManageMapper extends BaseMapper<CheckManage> {
      * @param bo
      * @return
      */
-    @DataPermission(tableAlias = "m")
      Page<CheckManageVo> selecSubCheckManageList(@Param("page") Page page, @Param("bo") CheckManageBo bo);
 }

zd-modules/zd-security/src/main/java/com/zd/security/service/CheckHazardService.java

@@ -211,7 +211,6 @@ public interface CheckHazardService extends IService<CheckHazard> {
      * @param checkHazardBo
      * @return
      */
-    @DataPermission(tableAlias = "h")
     Page <CheckHazardVo> groupBySubAndOption(Page page,CheckHazardBo checkHazardBo);
 
     /**

zd-modules/zd-security/src/main/resources/mapper/CheckHazardMapper.xml

@@ -530,9 +530,6 @@
 
         select h.id,m.title,m.college_name,m.subject_name,m.build_name,h.hazard_level,
         h.hazard_check_pro,h.hazard_check_code,m.room_number subRoom,
-        <!-- (select count(1) from sec_check_hazard h2  , sec_check_manage m2 where h2.check_manage_id = m2.id and m2.sub_id = m.sub_id
-        and m2.check_plan_id = p.id and  h2.hazard_check_pro1=h.hazard_check_pro1
-        and h2.hazard_check_pro2=h.hazard_check_pro2 and h2.hazard_check_pro=h.hazard_check_pro) sumTotal,-->
         ( select count(1) from sec_check_hazard_view v where v.sub_id=m.sub_id and
         v.hazard_check_pro=h.hazard_check_pro) sumTotal,
         h.examine_result,
@@ -563,7 +560,12 @@
                     #{id}
                 </foreach>
             </if>
-            and 1=1
+            <if test="checkHazardBo.userIds != null">
+                and h.create_by in
+                <foreach item="id" collection="checkHazardBo.userIds" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
         </where>
         <if test="checkHazardBo.appFlag == 1 ">
             ORDER BY m.check_time desc
@@ -642,7 +644,12 @@
                     #{id}
                 </foreach>
             </if>
-            and 1=1
+            <if test="checkHazardBo.userIds != null">
+                and m.create_by in
+                <foreach item="id" collection="checkHazardBo.userIds" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
         </where>
         group by m.id,m.dept_id
         ) t
@@ -721,7 +728,12 @@
                     #{id}
                 </foreach>
             </if>
-            and 1=1
+            <if test="checkHazardBo.userIds != null">
+                and m.create_by in
+                <foreach item="id" collection="checkHazardBo.userIds" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
         </where>
         GROUP BY m.sub_id,m.id
         ) t
@@ -760,7 +772,12 @@
                     #{id}
                 </foreach>
             </if>
-            and 1=1
+            <if test="bo.userIds != null">
+                and sv.create_by in
+                <foreach item="id" collection="bo.userIds" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
         </where>
         GROUP BY sv.hazard_name,sv.dept_id,sv.sub_id
     </select>
@@ -790,7 +807,12 @@
                     #{id}
                 </foreach>
             </if>
-            and 1=1
+            <if test="userIds != null">
+                and h.create_by in
+                <foreach item="id" collection="userIds" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
         </where>
     </select>
 
@@ -1165,7 +1187,12 @@
             <if test="endTime != null and endTime!=''">
                 and date_format(h.create_time,'%Y-%m-%d') &lt;=date_format(#{endTime},'%Y-%m-%d')
             </if>
-            and 1=1
+            <if test="userIds != null">
+                and  h.create_by in
+                <foreach item="id" collection="userIds" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
         </where>
         group by h.hazard_check_code1,h.hazard_check_name1 order by sumTotal desc
     </select>
@@ -1188,7 +1215,12 @@
             <if test="endTime != null and endTime!=''">
                 and date_format(h.create_time,'%Y-%m-%d') &lt;=date_format(#{endTime},'%Y-%m-%d')
             </if>
-            and 1=1
+            <if test="userIds != null">
+                and  h.create_by in
+                <foreach item="id" collection="userIds" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
         </where>
         group by m.subject_name order by sumTotal desc
     </select>
@@ -1212,7 +1244,12 @@
             <if test="bo.endTime != null and bo.endTime!=''">
                 and date_format(h.create_time,'%Y-%m-%d') &lt;=date_format(#{bo.endTime},'%Y-%m-%d')
             </if>
-            and 1=1
+            <if test="bo.userIds != null">
+                and  h.create_by in
+                <foreach item="id" collection="bo.userIds" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
         </where>
         GROUP BY h.hazard_check_name1,m.subject_name,m.type_name,m.level_name ORDER BY sumTotal desc
     </select>

zd-modules/zd-security/src/main/resources/mapper/CheckManageMapper.xml

@@ -406,13 +406,18 @@ from (
             <if test="bo.endTime != null and bo.endTime!=''">
                 and date_format(m.check_time,'%Y-%m-%d') &lt;=date_format(#{bo.endTime},'%Y-%m-%d')
             </if>
-            <if test="bo.deptIds != null">
+            <if test="bo.subListIds != null">
                 and  m.sub_id in
-                <foreach item="id" collection="bo.deptIds" open="(" separator="," close=")">
+                <foreach item="id" collection="bo.subListIds" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="bo.userIds != null">
+                and  m.create_by in
+                <foreach item="id" collection="bo.userIds" open="(" separator="," close=")">
                     #{id}
                 </foreach>
             </if>
-            and 1=1
         </where>
         GROUP BY m.sub_id
     </select>