Merge remote-tracking branch 'origin/develop_tzs_test' into develop_tzs_test

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

@@ -327,6 +327,8 @@ public class SingleEquipChangeProcess implements IEquipChangeDataProcessStrategy
             if (companyTypeObj != null && !"company".equals(companyTypeObj.getString("level"))) {
                 // 编辑账号为接收机构人员时，receiveCompanyCode取到地市级的接收机构代码
                 receiveCompanyCode = commonEquipDataProcessService.getJgUseRegistrationService().getCodeUtil().getCityRegionCode(companyTypeObj.getString("companyCode"));
+                String equCode = commonEquipDataProcessService.getJgRegisterInfoService().getEquCode(registerInfoNew, factoryInfoOld, receiveCompanyCode);
+                registerInfoNew.setEquCode(equCode);
             }
             if (companyTypeObj != null && "company".equals(companyTypeObj.getString("level"))) {
                 // 编辑账号企业人员时，receiveCompanyCode最近一次使用登记或者安装告知或者车用气瓶登记单据的接收机构代码
@@ -336,10 +338,10 @@ public class SingleEquipChangeProcess implements IEquipChangeDataProcessStrategy
                     recentlyReceiveCompanyCode = recentlyReceiveCompanyCode.stream().filter(map -> !ValidationUtil.isEmpty(map)).collect(Collectors.toList());
                     recentlyReceiveCompanyCode.sort(Comparator.comparing(map -> map.get("passedDate")));
                     receiveCompanyCode = commonEquipDataProcessService.getJgUseRegistrationService().getCodeUtil().getCityRegionCode(recentlyReceiveCompanyCode.get(0).get("receiveCompanyCode"));
+                    String equCode = commonEquipDataProcessService.getJgRegisterInfoService().getEquCode(registerInfoNew, factoryInfoOld, receiveCompanyCode);
+                    registerInfoNew.setEquCode(equCode);
                 }
             }
-            String equCode = commonEquipDataProcessService.getJgRegisterInfoService().getEquCode(registerInfoNew, factoryInfoOld, receiveCompanyCode);
-            registerInfoNew.setEquCode(equCode);
         }
     }
 }