修改编辑设备BUG

smart-city-platform/src/main/java/com/bz/smart_city/excel/resolver/WaterDeviceResolverExcelTemplate.java

@@ -166,7 +166,7 @@ public class WaterDeviceResolverExcelTemplate extends AbstractResolverExcelTempl
                     device.setUpdateBy("system");
                     device.setDateUpdate(LocalDateTime.now());
 
-                    if(device.getCustomerId().equals(linheCustomerId)){
+                    if(linheCustomerId.equals(device.getCustomerId())){
                         Boolean syncStatus = hlhtService.updatePayMeterEleno(device.getWaterMeterNo(),device.getWaterMeterFileNo());
                         if (syncStatus) {
                             device.setSyncStatus(1);

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/DeviceServiceImpl.java

@@ -455,7 +455,8 @@ public  class DeviceServiceImpl implements DeviceService {
         device.setWaterMeterNo(deviceDataDto.getWaterMeterNo());
         device.setRegisterStatus(0);
 
-        if(device.getCustomerId().equals(linheCustomerId)){
+
+        if(linheCustomerId.equals(device.getCustomerId())){
             Boolean syncStatus = hlhtService.updatePayMeterEleno(device.getWaterMeterNo(),device.getWaterMeterFileNo());
             if (syncStatus) {
                 device.setSyncStatus(1);
@@ -465,6 +466,8 @@ public  class DeviceServiceImpl implements DeviceService {
         }else {
             device.setSyncStatus(0);
         }
+
+
         //device.setUdipId(udipId);
         int result = this.insert(device);
 
@@ -659,7 +662,7 @@ public  class DeviceServiceImpl implements DeviceService {
             device.setRegisterStatus(1);
         }
 
-        if(device.getCustomerId().equals(linheCustomerId)){
+        if(linheCustomerId.equals(device.getCustomerId())){
             Boolean syncStatus = hlhtService.updatePayMeterEleno(device.getWaterMeterNo(),device.getWaterMeterFileNo());
             if (syncStatus) {
                 device.setSyncStatus(1);