diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml
index e1935bd..1982f3c 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml
@@ -40,7 +40,7 @@
         mts.id, mts.staff_id, mts.plan_id,mts.name, mts.company, mts.technology_job, mts.sign_time, mts.exam_result, mts.remark
         FROM meter_train_log mtl
         LEFT JOIN meter_train_plan mtp ON mtp.id = mtl.plan_id
-        LEFT JOIN meter_train_staff mts ON mtp.id = mts.plan_id
+        LEFT JOIN meter_train_staff mts ON (mtp.id = mts.plan_id AND mts.is_del = 0)
         WHERE mtl.id = #{id} AND mtl.is_del = 0
     </select>
 </mapper>

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml
index e1935bd..1982f3c 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml
@@ -40,7 +40,7 @@
         mts.id, mts.staff_id, mts.plan_id,mts.name, mts.company, mts.technology_job, mts.sign_time, mts.exam_result, mts.remark
         FROM meter_train_log mtl
         LEFT JOIN meter_train_plan mtp ON mtp.id = mtl.plan_id
-        LEFT JOIN meter_train_staff mts ON mtp.id = mts.plan_id
+        LEFT JOIN meter_train_staff mts ON (mtp.id = mts.plan_id AND mts.is_del = 0)
         WHERE mtl.id = #{id} AND mtl.is_del = 0
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml
index 364eb36..a678a5d 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml
@@ -37,7 +37,7 @@
         mts.technology_job, mts.exam_result, mts.sign_time, mts.remark, mtp.process_id
         FROM meter_train_plan mtp
         LEFT JOIN sys_dept sd ON mtp.dept_id = sd.id
-        LEFT JOIN meter_train_staff mts ON mtp.id = mts.plan_id
+        LEFT JOIN meter_train_staff mts ON (mtp.id = mts.plan_id AND mts.is_del = 0)
         WHERE mtp.id = #{id} AND mtp.is_del = 0
     </select>
 

diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml
index e1935bd..1982f3c 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainLogMapper.xml
@@ -40,7 +40,7 @@
         mts.id, mts.staff_id, mts.plan_id,mts.name, mts.company, mts.technology_job, mts.sign_time, mts.exam_result, mts.remark
         FROM meter_train_log mtl
         LEFT JOIN meter_train_plan mtp ON mtp.id = mtl.plan_id
-        LEFT JOIN meter_train_staff mts ON mtp.id = mts.plan_id
+        LEFT JOIN meter_train_staff mts ON (mtp.id = mts.plan_id AND mts.is_del = 0)
         WHERE mtl.id = #{id} AND mtl.is_del = 0
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml
index 364eb36..a678a5d 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterTrainPlanMapper.xml
@@ -37,7 +37,7 @@
         mts.technology_job, mts.exam_result, mts.sign_time, mts.remark, mtp.process_id
         FROM meter_train_plan mtp
         LEFT JOIN sys_dept sd ON mtp.dept_id = sd.id
-        LEFT JOIN meter_train_staff mts ON mtp.id = mts.plan_id
+        LEFT JOIN meter_train_staff mts ON (mtp.id = mts.plan_id AND mts.is_del = 0)
         WHERE mtp.id = #{id} AND mtp.is_del = 0
     </select>
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java
index 67bbe60..b399430 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java
@@ -419,7 +419,7 @@
         wrapper.like(StringUtils.isNotBlank(request.getPlanName()), "plan_name", request.getPlanName());
         wrapper.like(StringUtils.isNotBlank(request.getDirector()), "director", request.getDirector());
         wrapper.like(StringUtils.isNotBlank(request.getEffectiveCompany()), "effective_company", request.getEffectiveCompany());
-        wrapper.like(!Objects.isNull(request.getDeptId()), "dept_id", request.getDeptId());
+        wrapper.eq(Objects.nonNull(request.getDeptId()), "dept_id", request.getDeptId());
         wrapper.apply(StringUtils.isNotBlank(request.getTrainStartTime()),//apply方法传入参数名不能为空
                 "{0} <= DATE_FORMAT(train_time,'%Y-%m-%d')", request.getTrainStartTime().split(" ")[0]);
         wrapper.apply(StringUtils.isNotBlank(request.getTrainEndTime()),