安全检查

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

@@ -99,12 +99,12 @@ public class CoreSafetyTaskServiceImpl extends ServiceImpl<CoreSafetyTaskMapper,
             page.getRecords().forEach(r -> {
                 if (ObjectUtil.notEqual(r.getSourceType(), SafetyTaskSourceType.TempTask.getCode().longValue())) {
                     List<SafetyPlanRoleVo> roles = planRoles.stream().filter(pr -> ObjectUtil.equal(r.getPlanId(), pr.getPlanId())).collect(Collectors.toList());
-                    if (coreSafetyTask.getRoleId() != null) {
-                        roles = roles.stream().filter(e -> e.getRoleId().equals(coreSafetyTask.getRoleId())).collect(Collectors.toList());
+//                    if (coreSafetyTask.getRoleId() != null) {
+//                        roles = roles.stream().filter(e -> e.getRoleId().equals(coreSafetyTask.getRoleId())).collect(Collectors.toList());
                         r.setRoles(roles);
-                    } else {
-                        r.setRoles(roles);
-                    }
+//                    } else {
+//                        r.setRoles(roles);
+//                    }
                 } else {
                     Optional<IdNameVo> opt = tempTaskRoles.stream().filter(role -> ObjectUtil.equal(r.getRoleId(), role.getId())).findFirst();
                     if (opt.isPresent()) {

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

@@ -224,10 +224,14 @@
         LEFT JOIN sys_org o2 ON o2.id = t.check_org_id
         LEFT JOIN sys_user u1 ON u1.id = t.submit_by
         LEFT JOIN sys_role r1 ON r1.id = t.role_id
+        left join core_safecheck_plan_to_role csptr on csptr.plan_id = t.plan_id
         WHERE t.deleted = 0
         <if test="task.title != null  and task.title != ''">
             and t.title like concat('%', #{task.title}, '%')
         </if>
+        <if test="task.roleId != null  and task.roleId != ''">
+            and csptr.role_id =#{task.roleId}
+        </if>
         <if test="task.planStartTime != null ">
             and DATE_FORMAT(t.plan_start_time, '%Y-%m-%d') = DATE_FORMAT(#{task.planStartTime}, '%Y-%m-%d')
         </if>