Browse Source

fix: 待我审批列表增加过滤删除标记

JieZ 2 years ago
parent
commit
8fa01f9f54
1 changed files with 4 additions and 4 deletions
  1. 4 4
      bpm-core/src/main/resources/mapper/bpm/infra/ToaBillDao.xml

+ 4 - 4
bpm-core/src/main/resources/mapper/bpm/infra/ToaBillDao.xml

@@ -55,7 +55,7 @@
55
         AND btt.node_status IN ( 2, 3, 5,10 )
55
         AND btt.node_status IN ( 2, 3, 5,10 )
56
         AND btt.is_deleted = 0 AND pne.link_type!='create'
56
         AND btt.is_deleted = 0 AND pne.link_type!='create'
57
         GROUP BY
57
         GROUP BY
58
-        btt.bill_id ) bt INNER JOIN bill_task ba ON bt.ct = ba.sort AND ba.bill_id=bt.bill_id AND ba.user_code = #{userCode}
58
+        btt.bill_id ) bt INNER JOIN bill_task ba ON bt.ct = ba.sort AND ba.bill_id=bt.bill_id AND ba.user_code = #{userCode}  AND ba.is_deleted=0
59
         GROUP BY ba.bill_id) approver ON
59
         GROUP BY ba.bill_id) approver ON
60
         approver.bill_id = tb.id
60
         approver.bill_id = tb.id
61
         LEFT JOIN toa_form tf ON tf.process_id=tp.id AND tf.is_deleted=0
61
         LEFT JOIN toa_form tf ON tf.process_id=tp.id AND tf.is_deleted=0
@@ -95,7 +95,7 @@
95
         INNER JOIN bill_data_json bdj ON bdj.bill_id = tb.id and bdj.is_deleted = 0
95
         INNER JOIN bill_data_json bdj ON bdj.bill_id = tb.id and bdj.is_deleted = 0
96
         INNER JOIN (SELECT ba.node_name, ba.task_id, ba.user_code, ba.bill_id,ba.action FROM
96
         INNER JOIN (SELECT ba.node_name, ba.task_id, ba.user_code, ba.bill_id,ba.action FROM
97
         bill_task ba
97
         bill_task ba
98
-        WHERE node_status = 1 AND ba.user_code = #{approver}
98
+        WHERE node_status = 1 AND ba.user_code = #{approver} AND ba.is_deleted=0
99
         ORDER BY sort DESC ) approver ON approver.bill_id = tb.id
99
         ORDER BY sort DESC ) approver ON approver.bill_id = tb.id
100
         LEFT JOIN bill_read_record brr ON brr.user_code = #{approver} AND brr.bill_id = tb.id and
100
         LEFT JOIN bill_read_record brr ON brr.user_code = #{approver} AND brr.bill_id = tb.id and
101
         brr.is_deleted = 0
101
         brr.is_deleted = 0
@@ -140,7 +140,7 @@
140
         FROM toa_bill tb INNER JOIN toa_process tp ON tp.id = tb.process_id
140
         FROM toa_bill tb INNER JOIN toa_process tp ON tp.id = tb.process_id
141
         INNER JOIN bill_data_json bdj ON bdj.bill_id = tb.id and bdj.is_deleted = 0
141
         INNER JOIN bill_data_json bdj ON bdj.bill_id = tb.id and bdj.is_deleted = 0
142
         LEFT JOIN (SELECT ba.id, ba.bill_id, ba.node_name, ba.task_id, ba.user_code,ba.action
142
         LEFT JOIN (SELECT ba.id, ba.bill_id, ba.node_name, ba.task_id, ba.user_code,ba.action
143
-        FROM (SELECT bill_id, max(sort) AS ct FROM bill_task GROUP BY bill_id) AS bt
143
+        FROM (SELECT bill_id, max(sort) AS ct FROM bill_task where  is_deleted=0 GROUP BY bill_id) AS bt
144
         INNER JOIN bill_task ba ON bt.ct = ba.sort AND bt.bill_id = ba.bill_id GROUP BY ba.bill_id)
144
         INNER JOIN bill_task ba ON bt.ct = ba.sort AND bt.bill_id = ba.bill_id GROUP BY ba.bill_id)
145
         approver
145
         approver
146
         ON approver.bill_id = tb.id
146
         ON approver.bill_id = tb.id
@@ -224,7 +224,7 @@
224
         INNER JOIN bill_data_json bdj ON bdj.bill_id = tb.id and bdj.is_deleted = 0
224
         INNER JOIN bill_data_json bdj ON bdj.bill_id = tb.id and bdj.is_deleted = 0
225
         INNER JOIN (SELECT ba.node_name, ba.task_id, ba.user_code, ba.bill_id,ba.action FROM
225
         INNER JOIN (SELECT ba.node_name, ba.task_id, ba.user_code, ba.bill_id,ba.action FROM
226
         bill_task ba
226
         bill_task ba
227
-        WHERE node_status = 1 AND ba.user_code = #{approver}
227
+        WHERE node_status = 1 AND ba.user_code = #{approver}  AND ba.is_deleted=0
228
         ORDER BY sort DESC ) approver ON approver.bill_id = tb.id
228
         ORDER BY sort DESC ) approver ON approver.bill_id = tb.id
229
         LEFT JOIN bill_read_record brr ON brr.user_code = #{approver} AND brr.bill_id = tb.id and
229
         LEFT JOIN bill_read_record brr ON brr.user_code = #{approver} AND brr.bill_id = tb.id and
230
         brr.is_deleted = 0
230
         brr.is_deleted = 0