Merge branch 'develop_tzs_main' of http://39.100.92.250:5000/moa/amos-boot-biz…

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/JgOverDesignServiceLifeServiceImpl.java

@@ -14,7 +14,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
@@ -941,20 +940,25 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
             jsonObject.remove("equipmentLists");
             resultDataMap.put("equipmentLists", result);
         }
-        List<String> useOrgCodes = equipmentLists.stream()
+        String useOrgCode = equipmentLists.stream()
                 .map(obj -> ((JSONObject) obj).getString("useOrgCode"))
-                .collect(Collectors.toList());
-        List<JgUseRegistrationManage> registrationList = useRegistrationManageService.lambdaQuery()
-                .in(JgUseRegistrationManage::getUseRegistrationCode, useOrgCodes)
+                .filter(org.apache.commons.lang3.StringUtils::isNotEmpty)
+                .map(String::trim)
+                .findFirst()
+                .orElse(null);
+        JgUseRegistrationManage registration =
+                useRegistrationManageService.lambdaQuery()
+                        .eq(JgUseRegistrationManage::getUseRegistrationCode, useOrgCode)
                         .eq(JgUseRegistrationManage::getIsDelete, 0)
                         .eq(JgUseRegistrationManage::getCertificateStatus, CertificateStatusEnum.YIDENGJI.getName())
-                .list();
+                        .one();
+        if (registration == null) {
+            throw new BadRequest("未查询到使用登记信息");
+        }
         String companyAndOrg = overDesignServiceLife.getReceiveCompanyCode() + "_" + overDesignServiceLife.getReceiveOrgName();
         resultDataMap.put("receiveCompanyCode", companyAndOrg);
         resultDataMap.put("receiveOrgCode", companyAndOrg);
-        resultDataMap.put("sequenceNbrs", registrationList.stream()
-                .map(BaseEntity::getSequenceNbr)
-                .collect(Collectors.toList()));
+        resultDataMap.put("sequenceNbrs", registration.getSequenceNbr());
         commonService.convertStringToJsonobject(resultDataMap, new String[]{"otherAccessories"});
         commonService.convertStringToJsonobject(resultDataMap, new String[]{"useRegistrationFormFile"});
         commonService.convertStringToJsonobject(resultDataMap, new String[]{"safetyAssessmentReport"});