安全检查登记按机构类型过滤检查内容

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/controller/SafetyCheckRegisterController.java

@@ -65,7 +65,6 @@ public class SafetyCheckRegisterController extends BaseController {
 
     @ApiOperation(value = "授权")
     @PostMapping("grant")
-    @RequiresPermissions(value = {"core:safetycheck:grant"})
     public AjaxResult grant(@RequestBody GrantDto dto) {
         boolean r = safetyCheckRegisterSerice.grant(dto);
         return success(r);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/mapper/CoreSafetyTaskMapper.java

@@ -78,7 +78,7 @@ public interface CoreSafetyTaskMapper extends BaseMapper<CoreSafetyTask> {
      * @param taskId
      * @return
      */
-    List<AppTaskRegisterPointVo> selectPoint(@Param("planId") Long planId, @Param("taskId") Long taskId);
+    List<AppTaskRegisterPointVo> selectPoint(@Param("planId") Long planId, @Param("taskId") Long taskId,@Param("orgType") Integer orgType);
 
     /**
      * 查找来源于计划的任务检查内容信息

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/SafetyCheckRegisterSericeImpl.java

@@ -242,7 +242,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
             points = baseMapper.selectPointByTask(taskId);
             nfcs = baseMapper.selectNfcByTask(taskId);
         } else {
-            points = baseMapper.selectPoint(plan.getId(), taskId);
+            points = baseMapper.selectPoint(plan.getId(), taskId,beCheckedOrg.getType());
             nfcs = baseMapper.selectNfc(plan.getId(), taskId, task.getOrgId());
         }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/SafetyCheckRuleItemServiceImpl.java

@@ -147,12 +147,12 @@ public class SafetyCheckRuleItemServiceImpl
     public TableDataInfo pageQuery(SafetyCheckRuleItemPageDto itemPageDto) {
         Page<SafetyCheckRuleItemPageVo> page;
 
-        String pointName= itemPageDto.getPointName();
+        String pointName = itemPageDto.getPointName();
         page = safetyCheckRuleItemMapper.pageQuery(itemPageDto.getPageDto(), itemPageDto);
 //        int order = itemPageDto() * itemPageDto.getSize();
         for (SafetyCheckRuleItemPageVo vo : page.getRecords()) {
 //            vo.setOrder(++order);
-            final List<SafetyCheckRulePointDetailDto> pointList = safetyCheckRulePointMapper.selectDataListByItemId(vo.getId(),pointName);
+            final List<SafetyCheckRulePointDetailDto> pointList = safetyCheckRulePointMapper.selectDataListByItemId(vo.getId(), pointName);
             vo.setPointDtoList(pointList);
         }
 
@@ -168,7 +168,7 @@ public class SafetyCheckRuleItemServiceImpl
         SafetyCheckRuleItemDetailDto appRuleItemDto = new SafetyCheckRuleItemDetailDto();
         BeanUtils.copyProperties(appRuleItem, appRuleItemDto);
 
-        List<SafetyCheckRulePointDetailDto> list = safetyCheckRulePointMapper.selectDataListByItemId(id,null);
+        List<SafetyCheckRulePointDetailDto> list = safetyCheckRulePointMapper.selectDataListByItemId(id, null);
         appRuleItemDto.setPointDtoList(list);
         return appRuleItemDto;
     }
@@ -203,7 +203,12 @@ public class SafetyCheckRuleItemServiceImpl
             return tree;
         }
 
-        Map<Long, SysOrgVO> orgMap = orgs.stream().collect(Collectors.toMap(o -> o.getId(), o -> o));
+        Map<Long, SysOrgVO> orgMap = new HashMap<>();
+        orgs.forEach(org -> {
+            if (!orgMap.containsKey(org.getId())) {
+                orgMap.put(org.getId(), org);
+            }
+        });
         if (!orgMap.containsKey(orgId)) {
             return tree;
         }

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafetyTaskMapper.xml

@@ -657,10 +657,11 @@
         rd.submit_by,
         rd.submit_time
         FROM core_safecheck_plan_to_point b
-        LEFT JOIN core_safetycheck_rule_point a ON a.id = b.point_id
-        LEFT JOIN core_safecheck_plan c ON b.plan_id = c.id
-        LEFT JOIN core_safetycheck_rule_item e ON a.item_id = e.id
-        LEFT JOIN sys_area f ON a.area_id = f.id
+        Inner JOIN core_safetycheck_rule_point a ON a.id = b.point_id
+        INNER join core_safetycheck_rule r on a.rule_id=r.id and r.deleted=0 and r.org_type=#{orgType}
+        Inner JOIN core_safecheck_plan c ON b.plan_id = c.id
+        Inner JOIN core_safetycheck_rule_item e ON a.item_id = e.id
+        Inner JOIN sys_area f ON a.area_id = f.id
         LEFT JOIN core_safety_task_data rd ON rd.point_id = b.point_id and rd.task_id = #{taskId}
         WHERE
         <choose>