|
@@ -10,8 +10,8 @@
|
|
|
<select id="selectPagePendingClaim" resultType="com.aizuda.boot.modules.flw.entity.vo.ProcessTaskVO">
|
|
|
SELECT i.process_id,p.process_name,i.id AS instance_id,i.instance_state,t.id AS task_id,t.task_name,i.create_id,i.create_by,i.create_time
|
|
|
FROM flw_task t JOIN flw_task_actor a ON t.id=a.task_id LEFT JOIN flw_his_instance i ON i.id=t.instance_id LEFT JOIN flw_process p ON i.process_id=p.id
|
|
|
- WHERE a.id IN (SELECT f.id FROM flw_task_actor f JOIN sys_user_role r ON r.role_id::TEXT=f.actor_id WHERE f.actor_type=1 AND f.actor_id=#{dto.createId}
|
|
|
- UNION ALL SELECT f.id FROM flw_task_actor f JOIN sys_user_department r ON r.department_id::TEXT=f.actor_id WHERE f.actor_type=2 AND f.actor_id=#{dto.createId})
|
|
|
+ WHERE (a.actor_id=#{dto.createId} OR a.id IN (SELECT f.id FROM flw_task_actor f JOIN sys_user_role r ON r.role_id::TEXT=f.actor_id WHERE f.actor_type=1 AND f.actor_id=#{dto.createId}
|
|
|
+ UNION ALL SELECT f.id FROM flw_task_actor f JOIN sys_user_department r ON r.department_id::TEXT=f.actor_id WHERE f.actor_type=2 AND f.actor_id=#{dto.createId}))
|
|
|
<if test="dto.processName != null">
|
|
|
AND p.process_name LIKE CONCAT(CONCAT('%',#{dto.processName}),'%')
|
|
|
</if>
|
|
@@ -36,8 +36,8 @@
|
|
|
</if>
|
|
|
</select>
|
|
|
|
|
|
- <select id="selectPageMyReceived" resultType="com.aizuda.boot.modules.flw.entity.vo.ProcessTaskVO">
|
|
|
- SELECT i.process_id,p.process_name,i.id AS instance_id,i.instance_state,i.create_id,i.create_by,i.create_time
|
|
|
+ <select id="selectPageMyReceived" resultType="com.aizuda.boot.modules.flw.entity.vo.MyReceivedTaskVO">
|
|
|
+ SELECT i.process_id,p.process_name,i.current_node,i.id AS instance_id,i.instance_state,i.create_id,i.create_by,i.create_time,i.expire_time
|
|
|
FROM flw_his_instance i LEFT JOIN flw_process p ON i.process_id=p.id
|
|
|
WHERE EXISTS (SELECT 1 FROM flw_task_cc c WHERE i.id=c.instance_id)
|
|
|
<if test="dto.processName != null">
|