Merge remote-tracking branch 'origin/master'

rain

2026-01-29 5e73881ef728238e7f7a3bd5d74cf41f3f6b0923

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java

@@ -213,7 +213,13 @@

   @Override
   public FwAreaDivideVO selectFwAreaDivideDetail(Long id) {
      return baseMapper.selectFwAreaDivideDetail(id);
      FwAreaDivideVO detail = baseMapper.selectFwAreaDivideDetail(id);
      if (detail == null || detail.getId() == null) {
         return detail;
      }
      List<FwAreaDivideExtVO> extList = fwAreaDivideExtService.getByAreaDivideId(detail.getId());
      detail.setFwAreaDivideExtList(extList);
      return detail;
   }

   @Override
@@ -255,6 +261,13 @@
      // 主表与扩展面数据保持同一事务，扩展面列表为空时仅保存主表
      if (fwAreaDivide == null) {
         return false;
      }
      if (fwAreaDivideExtList != null && !fwAreaDivideExtList.isEmpty()) {
         // 由扩展面类型key去重生成主表areaTypeKeys
         String areaTypeKeys = buildAreaTypeKeys(fwAreaDivideExtList);
         if (StringUtil.isNotBlank(areaTypeKeys)) {
            fwAreaDivide.setAreaTypeKeys(areaTypeKeys);
         }
      }
      boolean isCreate = fwAreaDivide.getId() == null;
      boolean mainResult = saveOrUpdate(fwAreaDivide);
@@ -356,6 +369,38 @@
      }
   }

   private String buildAreaTypeKeys(List<FwAreaDivideExtEntity> fwAreaDivideExtList) {
      if (fwAreaDivideExtList == null || fwAreaDivideExtList.isEmpty()) {
         return null;
      }
      // 保持输入顺序，去重后拼接
      Set<String> keySet = new LinkedHashSet<>();
      for (FwAreaDivideExtEntity ext : fwAreaDivideExtList) {
         if (ext == null) {
            continue;
         }
         String key = ext.getAreaTypeKey();
         if (StringUtil.isBlank(key)) {
            continue;
         }
         // 兼容前端传入逗号分隔的类型key
         String[] keyArray = key.split(",");
         for (String item : keyArray) {
            if (item == null) {
               continue;
            }
            String value = item.trim();
            if (StringUtil.isNotBlank(value)) {
               keySet.add(value);
            }
         }
      }
      if (keySet.isEmpty()) {
         return null;
      }
      return String.join(",", keySet);
   }

   private List<Long> parseIdList(String ids) {
      if (StringUtil.isBlank(ids)) {
         return new ArrayList<>();