手工凭证流程监控处取值更改2 add by 39135 HuTianzhi

src/main/webapp/WEB-INF/classes/zjwfl/ZJWFL1060/zj_wfl_monitoring_query.lwm

@@ -58,12 +58,20 @@
         <!--<bm:data-filter name="query" expression="( (${/session/@role_id} = (select role_id from sys_role where role_code = '0006') and t1.workflow_code in (&apos;CONTRACT_INCEPT_WFL&apos;, &apos;DCFL_CSH_PAYMENT_REQ&apos;)) or (${/session/@role_id} in (select role_id from sys_role where role_code in ('0012', '0013', '0014')) and t1.workflow_code in (&apos;DCFL_CSH_PAYMENT_REQ&apos;, &apos;DEPOSIT_RETURN&apos;)) or (${/session/@role_id} = (select role_id from sys_role where role_code = '0005') and t1.workflow_code in (&apos;PROJECT_WFL&apos;)) or (${/session/@role_id} = (select role_id from sys_role where role_code = '0008') and t1.workflow_code in (&apos;CON_ET_WFL&apos;,&apos;TENANT_CHANGE_WFL&apos;,&apos;CON_BUYBACK_WFL&apos;,&apos;DEPOSIT_RETURN&apos;)) or (${/session/@role_id} not in (select role_id from sys_role where role_code in('0005', '0006', '0008', '0012', '0013', '0014')) and 1 = 1))"/>-->
         <!--凭证导出工作流只能由提交人和审批人看到，其余人无法在工作流监控中看到-->
         <bm:data-filter name="query" expression="( (${/session/@role_id} = (select role_id from sys_role where role_code = '0006') and t1.workflow_code in (&apos;CONTRACT_INCEPT_WFL&apos;, &apos;DCFL_CSH_PAYMENT_REQ&apos;)) or (${/session/@role_id} in (select role_id from sys_role where role_code in ('0012', '0013', '0014')) and t1.workflow_code in (&apos;DCFL_CSH_PAYMENT_REQ&apos;, &apos;DEPOSIT_RETURN&apos;)) or (${/session/@role_id} = (select role_id from sys_role where role_code = '0005') and t1.workflow_code in (&apos;PROJECT_WFL&apos;)) or (${/session/@role_id} = (select role_id from sys_role where role_code = '0008') and t1.workflow_code in (&apos;CON_ET_WFL&apos;,&apos;TENANT_CHANGE_WFL&apos;,&apos;CON_BUYBACK_WFL&apos;,&apos;DEPOSIT_RETURN&apos;)) or (${/session/@role_id} not in (select role_id from sys_role where role_code in('0005', '0006', '0008', '0012', '0013', '0014')) and 1 = 1)
-       or( ((t1.SUBMITTED_BY = ${/session/@user_id}) or  ( (Select t.user_name From sys_user t  Where t.user_id = ${/session/@user_id})
-       in (Select u.user_name
-                  From zj_wfl_instance_node_recipient t, sys_user u
+       or( ((t1.SUBMITTED_BY = ${/session/@user_id}) or  (
+       (${/session/@user_id}
+       in (Select t.user_id
+                  From zj_wfl_instance_node_recipient t
                  Where t.instance_id = t1.instance_id
-                   And t.user_id = u.user_id
                    And t.record_type = 'APPROVER')
+                   and t1.instance_status in (-1000,-1,10))
+        or
+       (${/session/@user_id}
+       in (Select t.user_id
+                  From zj_wfl_instance_node_rcpt_ht t
+                 Where t.instance_id = t1.instance_id
+                   And t.record_type = 'APPROVER')
+                   and t1.instance_status in (-1000,-1,10))
    ) ) and t1.workflow_code in('HLS_JOURNAL_WFL','HLS_JOURNAL_REVERSE_WFL')))"/>
-    </bm:data-filters>
+       </bm:data-filters>
 </bm:model>