fix(jg):解决没有接收机构生成设备代码带null

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/PieLineDataChangeServiceImpl.java

@@ -330,6 +330,8 @@ public class PieLineDataChangeServiceImpl {
 
     private Double calTotalPieLineLength(String projectContraptionId) {
         List<String> records = useInfoService.list(new LambdaQueryWrapper<IdxBizJgUseInfo>().eq(IdxBizJgUseInfo::getProjectContraptionId, projectContraptionId).select(IdxBizJgUseInfo::getRecord)).stream().map(IdxBizJgUseInfo::getRecord).collect(Collectors.toList());
+        // 如果没有记录，直接返回 0.0
+        if (records.isEmpty()) return 0.0;
         List<IdxBizJgTechParamsPipeline> techParamsPipelines = idxBizJgTechParamsPipelineService.list(new LambdaQueryWrapper<IdxBizJgTechParamsPipeline>().in(IdxBizJgTechParamsPipeline::getRecord, records).select(IdxBizJgTechParamsPipeline::getRecord, IdxBizJgTechParamsPipeline::getPipeLength));
         return techParamsPipelines.stream().filter(i -> i.getPipeLength() != null).map(e -> new BigDecimal(e.getPipeLength()))
                 .reduce(BigDecimal.ZERO, BigDecimal::add)

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

@@ -4153,7 +4153,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 if (registerInfo != null) {
                     registerInfo.setUseOrgCode(jgUseRegistration.getUseRegistrationCode());
                     registerInfo.setEquCodeType(String.valueOf(map.get("equCodeType")));
-                    equCode = ObjectUtils.isEmpty(map.get("equCode")) ? this.getEquCode(registerInfo, jgUseRegistration.getReceiveCompanyCode()) : String.valueOf(map.get("equCode"));
+                    equCode = ObjectUtils.isEmpty(map.get("equCode")) && !StringUtils.isEmpty(jgUseRegistration.getReceiveCompanyCode())
+                            ? this.getEquCode(registerInfo, jgUseRegistration.getReceiveCompanyCode())
+                            : String.valueOf(map.get("equCode"));
                     registerInfo.setEquCode(equCode);// 设备代码
                     registerInfo.setEquPrice(String.valueOf(map.get("equPrice")));
                     registerInfo.setProductPhoto(JSONObject.toJSONString(map.get("productPhoto")));