调整

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/riskalert/RiskAlertMapper.java

@@ -18,7 +18,7 @@ public interface RiskAlertMapper extends BaseMapperX<Object> {
             FROM pressure_task_order o
             JOIN pressure2_boiler_task_order_item i ON o.id = i.order_id AND i.task_status >= 400 AND i.task_status != 800
             JOIN pressure2_boiler_task_order_item_report r ON i.id = r.order_item_id AND r.report_type = 100 AND r.task_status NOT IN (200, 800)
-            JOIN pressure2_boiler_task_order_item_report_user u ON r.id = u.report_id AND u.user_id = #{userId}
+            JOIN pressure2_boiler_task_order_item_report_user u ON r.id = u.report_id AND u.DELETED = 0 AND u.user_id = #{userId}
             WHERE o.equip_main_type = 200
               AND o.task_status NOT IN (200, 800)
             """)
@@ -47,7 +47,7 @@ public interface RiskAlertMapper extends BaseMapperX<Object> {
             FROM pressure_task_order o
             JOIN pressure2_pipe_task_order_item i ON o.id = i.order_id AND i.task_status != 800
             JOIN pressure2_pipe_task_order_item_report r ON o.id = r.order_id AND r.report_type = 100 AND r.task_status NOT IN (200, 800)
-            JOIN pressure2_pipe_task_order_item_report_user u ON r.id = u.report_id AND u.user_id = #{userId}
+            JOIN pressure2_pipe_task_order_item_report_user u ON r.id = u.report_id AND u.DELETED = 0 AND u.user_id = #{userId}
             WHERE o.equip_main_type = 300
               AND o.task_status NOT IN (200, 800)
             """)