|
@@ -19,8 +19,8 @@
|
|
|
SELECT i.process_id,p.process_name,i.id AS instance_id,i.create_by AS launch_by,i.create_time AS launch_time,
|
|
|
t.id AS task_id,t.create_time,t.task_name,t.display_name,t.task_type,t.perform_type,t.expire_time,t.remind_time,t.remind_repeat
|
|
|
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.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 r.user_id=#{dto.userId}
|
|
|
+ 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 r.user_id=#{dto.userId})
|
|
|
<if test="dto.processName != null">
|
|
|
AND p.process_name LIKE CONCAT(CONCAT('%',#{dto.processName}),'%')
|
|
|
</if>
|