Merge remote-tracking branch 'origin/feat-250603-ruleUpdate' into cnbg-master

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/SysImplementPlanManager.java

@@ -860,49 +860,60 @@ public class SysImplementPlanManager {
                   implPlanDetailsService.getDetailsByPlanId(
                       p.getPlanId(), UpmsState.ImplPlanDetailsState.PASSED);
               copied.setPlanDetails(details);
-              if (details != null) {
-
-                // 拆解子项
-                List<SysImplPlanDetailsItem> detailsItems =
-                    implPlanDetailsItemService.listDetailItems(details.getDetailsId()).stream()
-                        .filter(item -> item.getQty() > 0)
-                        .collect(Collectors.toList());
-
-                List<Map<String, Object>> coll = null;
-                if (CollUtil.isNotEmpty(detailsItems)) {
-
-                  coll =
-                      detailsItems.stream()
-                          .map(
-                              item -> {
-                                Map<String, Object> map = BeanUtil.copyProperties(item, Map.class);
-                                WmTaskType taskType = collect.get(item.getTaskTypeName());
-                                map.put(
-                                    "orgTaskTypeId",
-                                    Objects.nonNull(taskType) ? taskType.getId() : null);
-                                map.put(
-                                    "baseId",
-                                    Objects.nonNull(taskType) ? taskType.getBaseId() : null);
-                                map.put(
-                                    "parent_id",
-                                    Objects.nonNull(taskType) ? taskType.getParentId() : null);
-                                return map;
-                              })
-                          .filter(m -> Objects.nonNull(m.get("parent_id")))
-                          .sorted(Comparator.comparing(m -> (String) m.get("parent_id")))
-                          .collect(Collectors.toList());
-                }
-
-                copied.setPlanItems(CollUtil.isNotEmpty(coll) ? coll : Collections.emptyList());
-              }
+              copied.setPlanItems(getDetailItems(collect, details));
 
               return copied;
             })
         .collect(Collectors.toList());
   }
 
+  private List<Map<String, Object>> getDetailItems(Map<String, WmTaskType> collect,
+      SysImplPlanDetails details) {
+    if (details != null) {
+
+      // 拆解子项
+      List<SysImplPlanDetailsItem> detailsItems =
+          implPlanDetailsItemService.listDetailItems(details.getDetailsId()).stream()
+              .filter(item -> item.getQty() > 0)
+              .collect(Collectors.toList());
+
+      List<Map<String, Object>> coll = null;
+      if (CollUtil.isNotEmpty(detailsItems)) {
+
+        coll =
+            detailsItems.stream()
+                .map(
+                    item -> {
+                      Map<String, Object> map = BeanUtil.copyProperties(item, Map.class);
+                      WmTaskType taskType = collect.get(item.getTaskTypeName());
+                      map.put(
+                          "orgTaskTypeId",
+                          Objects.nonNull(taskType) ? taskType.getId() : null);
+                      map.put(
+                          "baseId",
+                          Objects.nonNull(taskType) ? taskType.getBaseId() : null);
+                      map.put(
+                          "parent_id",
+                          Objects.nonNull(taskType) ? taskType.getParentId() : null);
+                      return map;
+                    })
+                .filter(m -> Objects.nonNull(m.get("parent_id")))
+                .sorted(Comparator.comparing(m -> (String) m.get("parent_id")))
+                .collect(Collectors.toList());
+      }
+
+      if (CollUtil.isNotEmpty(coll)) {
+        return coll;
+      }
+    }
+    return Collections.emptyList();
+  }
+
   public SysImplementPlanVO.ToList findById(Long planId) {
     SysImplementPlan p = implementPlanService.getById(planId);
+    if (p == null) {
+      return null;
+    }
     SysImplementPlanVO.ToList copied = BeanUtil.copyProperties(p, SysImplementPlanVO.ToList.class);
 
     // 设置承接人信息
@@ -940,6 +951,13 @@ public class SysImplementPlanManager {
                 .orderByDesc(SysImplPlanDetails::getUpdateTime));
     copied.setPlanDetails(CollUtil.isEmpty(details) ? null : details.get(0));
 
+    Map<String, WmTaskType> collect =
+        taskTypeService
+            .list(Wrappers.<WmTaskType>lambdaQuery().lt(WmTaskType::getId, "100"))
+            .stream()
+            .collect(Collectors.toMap(WmTaskType::getTaskTypeName, Function.identity()));
+    copied.setPlanItems(getDetailItems(collect, copied.getPlanDetails()));
+
     // 获取父级
     Integer parentId = p.getParentId();
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysUserServiceImpl.java

@@ -657,12 +657,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             }
 
             // 校验部门下是否有启用的用户
-            int count = count(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getDelFlag, CommonConstants.STATUS_NORMAL).eq(SysUser::getUsername, username));
+            // int count = count(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getDelFlag, CommonConstants.STATUS_NORMAL).eq(SysUser::getUsername, username));
             // .eq(dept != null, SysUser::getDeptId, dept.getDeptId()));
-            if (count != 0) {
+            /* if (count != 0) {
                 log.info("手机号被占用");
                 errorMap(errorMap, "手机号被占用", commonUserDTO.getId());
-            }
+            } */
 
             userDTO.setPlatId(username);
             userDTO.setPhone(username);