水电表平台修改

huimv-env-common/src/main/java/com/huimv/env/common/service/impl/EnergyEnvDeviceServiceImpl.java

@@ -92,7 +92,8 @@ public class EnergyEnvDeviceServiceImpl extends ServiceImpl<EnergyEnvDeviceMappe
         String deviceName = energyEnvDevice.getDeviceName();
 
         QueryWrapper<EnergyEnvDevice> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq(StringUtils.isNotBlank(deviceName),"device_name", deviceName).ne("id",energyEnvDevice.getId());
+        queryWrapper1.eq(StringUtils.isNotBlank(deviceName), "device_name", deviceName).ne("id", energyEnvDevice.getId())
+                .eq("farm_id", energyEnvDevice.getFarmId());
 
         Integer count = energyEnvDeviceMapper.selectCount(queryWrapper1);
         if (count>0) {