fix:jg-平台历史登记接收机构历史错误数据限制处理

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java

@@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
@@ -20,6 +19,7 @@ import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
@@ -59,6 +59,7 @@ import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import io.seata.spring.annotation.GlobalTransactional;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.io.IOUtils;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
@@ -1810,8 +1811,22 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
         if (!ObjectUtils.isEmpty(detail) && !StringUtils.isEmpty(detail.get("organizationCode")) && !StringUtils.isEmpty(detail.get("organizationName"))) {
             String receiveOrgCode = (String) detail.get("organizationCode");
-            String receiveOrgName = (String) detail.get("organizationName");
-            detail.put("receiveOrgCode", receiveOrgCode + "_" + receiveOrgName);
+
+            List<LinkedHashMap> receiveUnitTree = commonServiceImpl.getReceiveUnitTree("register");
+
+            List<Map<String, Object>> receiveUnitList = Lists.newArrayList();
+
+            if (!receiveUnitTree.isEmpty() && !receiveUnitTree.get(0).isEmpty()) {
+                convertTreeToListMap(receiveUnitTree.get(0), receiveUnitList);
+            }
+            // 查询receiveUnitTree中符合receiveOrgCode的数据
+            Map<String, Object> resultMap = receiveUnitList.stream().filter(map -> receiveOrgCode.equals(map.get("companyCode"))).findFirst().orElse(null);
+            if (ValidationUtil.isEmpty(resultMap)) {
+                detail.put("receiveOrgCode", null);
+            } else {
+                String receiveOrgName = (String) resultMap.get("companyName");
+                detail.put("receiveOrgCode", receiveOrgCode + "_" + receiveOrgName);
+            }
         }
 
         // 监督管理信息
@@ -1869,6 +1884,17 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         return detail;
     }
 
+    private void convertTreeToListMap(LinkedHashMap receiveUnit, List<Map<String, Object>> resultList) {
+        resultList.add(receiveUnit);
+
+        if (receiveUnit.containsKey("children") && !ValidationUtil.isEmpty(receiveUnit.get("children"))) {
+            List<LinkedHashMap> children = (List<LinkedHashMap>) receiveUnit.get("children");
+            for (LinkedHashMap child : children) {
+                convertTreeToListMap(child, resultList);
+            }
+        }
+    }
+
     private String setDefaultRecord(JgUseRegistration jgUseRegistration, String record) {
         if (StringUtils.isEmpty(record)) {
             JgUseRegistrationEq jgUseRegistrationEq = jgUseRegistrationEqService.getOne(new LambdaQueryWrapper<JgUseRegistrationEq>().eq(JgUseRegistrationEq::getEquipTransferId, jgUseRegistration.getSequenceNbr()));