diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/controller/ElectricityMeterController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/controller/ElectricityMeterController.java
index add1cfc..07f8dfe 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/controller/ElectricityMeterController.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/controller/ElectricityMeterController.java
@@ -41,7 +41,7 @@ public class ElectricityMeterController extends JeecgController<ElectricityMeter
 												   HttpServletRequest req) {
 		Page<ElectricityMeter> page = new Page<ElectricityMeter>(pageNo, pageSize);
 		QueryWrapper<ElectricityMeter> queryWrapper = QueryGenerator.initQueryWrapper(electricityMeter, req.getParameterMap());
-		IPage<ElectricityMeter> pageList = service.page(page, queryWrapper);
+		IPage<ElectricityMeter> pageList = service.findPage(page, electricityMeter);
 		return Result.OK(pageList);
 	}
 
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 a457296..703d675 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
@@ -16,7 +16,7 @@
 			b.disconnect_time as disconnectTime,
 			b.connect_time as connectTime,
 			a.nu_id as nuId,
-			a.nu_name as nuName,
+			c.nu_name as nuName,
 			a.depart_id as departId,
 			a.depart_name as departName,
 			a.depart_server_url as departServerUrl,
@@ -24,6 +24,7 @@
 			a.sync_type
 		from nu_iot_tq_electricity_meter a
 		left join nu_iot_tq_collector b on a.cid = b.cid
+		left join nu_base_info c on a.nu_id = c.nu_id
 		<where>
 			<if test="params.address != null and params.address != ''">
 				AND a.address like concat('%',#{params.address},'%')
diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/controller/WaterMeterController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/controller/WaterMeterController.java
index a084683..b804fa0 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/controller/WaterMeterController.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/controller/WaterMeterController.java
@@ -42,7 +42,7 @@ public class WaterMeterController extends JeecgController<WaterMeter, IWaterMete
 														 HttpServletRequest req) {
 		Page<WaterMeter> page = new Page<WaterMeter>(pageNo, pageSize);
 		QueryWrapper<WaterMeter> queryWrapper = QueryGenerator.initQueryWrapper(waterMeter, req.getParameterMap());
-		IPage<WaterMeter> pageList = service.page(page, queryWrapper);
+		IPage<WaterMeter> pageList = service.findPage(page, waterMeter);
 		return Result.OK(pageList);
 	}
 
diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml
index ebf7332..9554066 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml
@@ -17,11 +17,12 @@
 		b.disconnect_time as disconnectTime,
 		b.connect_time as connectTime,
 		a.nu_id as nuId,
-		a.nu_name as nuName,
+		c .nu_name as nuName,
 		a.depart_id as departId,
 		a.depart_name as departName
 		from nu_iot_tq_water_meter a
 		left join nu_iot_tq_collector b on a.cid = b.cid
+		left join nu_base_info c on a.nu_id = c.nu_id
 		<where>
 			<if test="params.address != null and params.address != ''">
 				AND a.address like concat('%',#{params.address},'%')
diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/controller/HumidDeviceController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/controller/HumidDeviceController.java
index 05fa531..6bf11e1 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/controller/HumidDeviceController.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/controller/HumidDeviceController.java
@@ -41,7 +41,7 @@ public class HumidDeviceController extends JeecgController<HumidDevice, IHumidDe
 													HttpServletRequest req) {
 		Page<HumidDevice> page = new Page<HumidDevice>(pageNo, pageSize);
 		QueryWrapper<HumidDevice> queryWrapper = QueryGenerator.initQueryWrapper(humidDevice, req.getParameterMap());
-		IPage<HumidDevice> pageList = service.page(page, queryWrapper);
+		IPage<HumidDevice> pageList = service.findPage(page, humidDevice);
 		return Result.OK(pageList);
 	}
 
diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/mapper/xml/HumidDeviceMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/mapper/xml/HumidDeviceMapper.xml
index 13e122f..57573f7 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/mapper/xml/HumidDeviceMapper.xml
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/mapper/xml/HumidDeviceMapper.xml
@@ -4,50 +4,51 @@
 
 	<select id="findPage" parameterType="com.nu.modules.yiweilian.humid.entity.HumidDevice" resultType="com.nu.modules.yiweilian.humid.entity.HumidDevice">
 		select
-			id,
-			sn,
-			device_name as deviceName,
-			device_types as deviceTypes,
-			reporting_interval as reportingInterval,
-			record_interval as recordInterval,
-			history_report_time as historyReportTime,
-			history_interval as historyInterval,
-			temperature_high as temperatureHigh,
-			temperature_low as temperatureLow,
-			temperature_buffer as temperatureBuffer,
-			humidity_high as humidityHigh,
-			humidity_low as humidityLow,
-			humidity_buffer as humidityBuffer,
-			iz_outages as izOutages,
-			iz_low_battery as izLowBattery,
-			iz_online as izOnline,
-			time_code as timeCode,
-			temperature,
-			humidity,
-		    status,
-			reporting_time as reportingTime,
-			electricity,
-			nu_id as nuId,
-			nu_name as nuName,
-			depart_id as departId,
-			depart_name as departName,
-			depart_server_url as departServerUrl,
-			old_server_url ,
-			sync_type,
+			a.id,
+		a.sn,
+		a.device_name as deviceName,
+		a.device_types as deviceTypes,
+		a.reporting_interval as reportingInterval,
+		a.record_interval as recordInterval,
+		a.history_report_time as historyReportTime,
+		a.history_interval as historyInterval,
+		a.temperature_high as temperatureHigh,
+		a.temperature_low as temperatureLow,
+		a.temperature_buffer as temperatureBuffer,
+		a.humidity_high as humidityHigh,
+		a.humidity_low as humidityLow,
+		a.humidity_buffer as humidityBuffer,
+		a.iz_outages as izOutages,
+		a.iz_low_battery as izLowBattery,
+		a.iz_online as izOnline,
+		a.time_code as timeCode,
+		a.temperature,
+		a.humidity,
+		a.status,
+		a.reporting_time as reportingTime,
+		a.electricity,
+		a.nu_id as nuId,
+		b.nu_name as nuName,
+		a.depart_id as departId,
+		a.depart_name as departName,
+		a.depart_server_url as departServerUrl,
+		a.old_server_url ,
+		a.sync_type,
 		    (select count(*) from nu_iot_yiweilian_humid_alarm b where a.sn = b.sn and b.status = '0') as alarmCn
 		from nu_iot_yiweilian_humid_device a
+		left join nu_base_info b on a.nu_id = b.nu_id
 		<where>
 			<if test="params.sn != null and params.sn != ''">
-				AND sn = #{params.sn}
+				AND a.sn = #{params.sn}
 			</if>
 			<if test="params.nuId != null and params.nuId != ''">
-				AND nu_id = #{params.nuId}
+				AND a.nu_id = #{params.nuId}
 			</if>
 			<if test="params.departId != null and params.departId != ''">
-				AND depart_id = #{params.departId}
+				AND a.depart_id = #{params.departId}
 			</if>
 			<if test="params.status != null and params.status != ''">
-				AND status = #{params.status}
+				AND a.status = #{params.status}
 			</if>
 		</where>
 	</select>