diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml
index 38e9fd4..652cd8d 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml
@@ -79,6 +79,7 @@
 			a.old_server_url ,
 			a.sync_type
 		from nu_iot_tq_electricity_meter a
+		left join nu_iot_tq_collector b on a.cid = b.cid
 	</select>
 
 	<select id="getElectricityMeter" parameterType="com.nu.modules.tq.electricity.entity.ElectricityMeter" resultType="com.nu.modules.tq.electricity.entity.ElectricityMeter">
diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/weihu/service/impl/DeviceMaintainServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/weihu/service/impl/DeviceMaintainServiceImpl.java
index 724f4c3..43c8669 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/weihu/service/impl/DeviceMaintainServiceImpl.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/weihu/service/impl/DeviceMaintainServiceImpl.java
@@ -65,19 +65,19 @@ public class DeviceMaintainServiceImpl extends ServiceImpl<DeviceMaintainMapper,
             di.setRemark(remark);
             di.setUpdateDate(updateDate);
             updateDeviceByType(di);
-            QueryWrapper<DeviceMaintain> qw = new QueryWrapper<>();
-            qw.eq("device_id",di.getDeviceId());
-            DeviceMaintain entity = this.getOne(qw);
-            if(entity!=null){
-                entity.setReserveDepartId(reserveDepartId);
-                entity.setReserveDepartName(reserveDepartName);
-                entity.setRemark(remark);
-                entity.setUpdateDate(updateDate);
-                this.updateById(entity);
-            }else{
+//            QueryWrapper<DeviceMaintain> qw = new QueryWrapper<>();
+//            qw.eq("device_id",di.getDeviceId());
+//            DeviceMaintain entity = this.getOne(qw);
+//            if(entity!=null){
+//                entity.setReserveDepartId(reserveDepartId);
+//                entity.setReserveDepartName(reserveDepartName);
+//                entity.setRemark(remark);
+//                entity.setUpdateDate(updateDate);
+//                this.updateById(entity);
+//            }else{
                 di.setId(null);
                 this.save(di);
-            }
+//            }
         }
     }