Pārlūkot izejas kodu

修改人员删除时健康墙还展示其数据

Administrator 5 gadi atpakaļ
vecāks
revīzija
bd55b193f9

+ 1 - 0
common/src/main/resources/mapper/base/PersonDeviceFilterLog.xml

@@ -348,6 +348,7 @@
         <foreach collection="list" index="index" item="item" open="(" separator="," close=")">#{item.id}
         </foreach>
         and a.del_flag = 0
+        and b.del_flag = 0
         <if test="popedom!=null">
             and b.popedom_ like #{popedom}
         </if>

+ 3 - 0
common/src/main/resources/mapper/base/PersonDeviceLog.xml

@@ -255,6 +255,7 @@
             from base_person_device_log m inner join base_person_info n ON m.person_id = n.id_
             where m.record_time>=#{startTime}
             and m.record_time <=#{endTime}
+            and n.del_flag = 0
         ]]>
         <foreach collection="companyList" index="index" item="item" open=" and n.company_id in (" separator="," close=")">
             #{item.id}
@@ -284,6 +285,7 @@
             from base_person_device_log m inner join base_person_info n ON m.person_id = n.id_
             where m.record_time>=#{startTime}
             and m.record_time <=#{endTime}
+            and n.del_flag = 0
             and n.guest_enabled is not true
         ]]>
         <foreach collection="companyList" index="index" item="item" open=" and n.company_id in (" separator="," close=")">
@@ -389,6 +391,7 @@
         on a.person_id = b.id_
         where a.record_time >=#{startTime}
         and a.record_time &lt;= #{endTime}
+        and b.del_flag = 0
         and b.guest_enabled is not true
         <foreach collection="list" index="index" item="item" open=" and b.company_id in (" separator="," close=")">   #{item.id}
         </foreach>