禅道bug处理

assistMg/src/main/java/com/hotent/baseInfo/manager/impl/CostDocumentWhManagerImpl.java

@@ -100,15 +100,15 @@ public class CostDocumentWhManagerImpl extends BaseManagerImpl<CostDocumentWhDao
         }
         IUser iUser = ContextUtil.getCurrentUser();
         User user = userService.getByAccount(iUser.getAccount());
-        if (StringUtil.isNotEmpty(costDocumentWh.getId())) {
+
             costDocumentWh.setUpdateBy(user.getFullname());
             costDocumentWh.setCreateId(user.getAccount());
             costDocumentWh.setUpdateTime(LocalDateTime.now());
-        }else {
+
             costDocumentWh.setCreateTime(LocalDateTime.now());
             costDocumentWh.setCreateId(user.getAccount());
             costDocumentWh.setCreateBy(user.getFullname());
-        }
+
         costDocumentWh.setLastGenerateDate(LocalDate.now());
         //新建或更新
         this.saveOrUpdate(costDocumentWh);

assistMg/src/main/java/com/hotent/enterpriseDeclare/controller/material/CostProjectTaskMaterialSummaryController.java

@@ -401,7 +401,7 @@ public class CostProjectTaskMaterialSummaryController extends BaseController<Cos
         }
 
         // 4. 案卷封底（不计入页码）
-        /*ArchiveProofreadResp backCoverResp = new ArchiveProofreadResp();
+        ArchiveProofreadResp backCoverResp = new ArchiveProofreadResp();
         backCoverResp.setOrderNum(displayOrderNum);
         backCoverResp.setMaterialName("案卷封底（成本监审卷宗备考表）");
         backCoverResp.setDocumentType(3);
@@ -424,8 +424,8 @@ public class CostProjectTaskMaterialSummaryController extends BaseController<Cos
             }
         } else {
             backCoverResp.setGenerateStatus("0");
-        }*/
-        //resultList.add(backCoverResp);
+        }
+        resultList.add(backCoverResp);
 
         return CommonResult.<List<ArchiveProofreadResp>>ok().value(resultList);
     }

assistMg/src/main/java/com/hotent/project/manager/impl/SysAreaServiceImpl.java

@@ -40,15 +40,34 @@ public class SysAreaServiceImpl extends ServiceImpl<SysAreaDao, SysArea> impleme
     @Override
     public List<SysArea> getByParentCode(String parentCode) {
         if (!StringUtils.hasText(parentCode)) {
-            parentCode = "0";
+            throw new IllegalArgumentException("地区编码不能为空");
         }
-        LambdaQueryWrapper<SysArea> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(SysArea::getParentCode, parentCode)
-                //.eq(SysArea::getStatus, 1)
-                .orderByAsc(SysArea::getSort);
-        return this.list(wrapper);
+
+        // 查询所有地区数据，一次性加载到内存
+        List<SysArea> allAreas = this.list();
+
+        // 递归查找所有子级
+        return findChildren(allAreas, parentCode);
     }
+    /**
+     * 递归查找所有子级地区
+     */
+    private List<SysArea> findChildren(List<SysArea> allAreas, String parentCode) {
+        List<SysArea> result = new ArrayList<>();
+
+        // 查找直接子级
+        List<SysArea> directChildren = allAreas.stream()
+                .filter(area -> parentCode.equals(area.getParentCode()))
+                .collect(Collectors.toList());
 
+        for (SysArea child : directChildren) {
+            result.add(child);
+            // 递归查找子级的子级
+            result.addAll(findChildren(allAreas, child.getCode()));
+        }
+
+        return result;
+    }
     @Override
     public List<SysArea> getByParentCodes(List<String> parentCodes) {
         LambdaQueryWrapper<SysArea> wrapper = new LambdaQueryWrapper<>();