约检确认单位地址修改

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/equipboilerscheduling/EquipBoilerSchedulingServiceImpl.java

@@ -645,7 +645,10 @@ public class EquipBoilerSchedulingServiceImpl extends ServiceImpl<EquipBoilerSch
             // 设备邮编
             appointmentConfirmOrderDO.setUseUnitZipcode(equipContainerDO.getZipCode());
 
-            ClientUnitDTO unitDTO = clientUnitApi.getClientUnitByCode(equipContainerDO.getUnitId()).getData();
+            ClientUnitDTO unitDTO = clientUnitApi.getClientUnit(equipContainerDO.getUnitId()).getData();
+            if (unitDTO == null) {
+                unitDTO = clientUnitApi.getClientUnitByCode(equipContainerDO.getUnitCode()).getData();
+            }
             if (unitDTO == null) {
                 unitDTO = clientUnitApi.getClientUnitByName(equipContainerDO.getUnitName()).getData();
             }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/equippipescheduling/EquipPipeSchedulingServiceImpl.java

@@ -703,7 +703,10 @@ public class EquipPipeSchedulingServiceImpl extends ServiceImpl<EquipPipeSchedul
             appointmentConfirmOrderDO.setUseUnitAddress(equipPipeDO.getUnitAddress());
             appointmentConfirmOrderDO.setUseUnitName(equipPipeDO.getUnitName());
 
-            ClientUnitDTO unitDTO = clientUnitApi.getClientUnitByCode(equipPipeDO.getUnitId()).getData();
+            ClientUnitDTO unitDTO = clientUnitApi.getClientUnit(equipPipeDO.getUnitId()).getData();
+            if (unitDTO == null) {
+                unitDTO = clientUnitApi.getClientUnitByCode(equipPipeDO.getUnitCode()).getData();
+            }
             if (unitDTO == null) {
                 unitDTO = clientUnitApi.getClientUnitByName(equipPipeDO.getUnitName()).getData();
             }