|
@@ -40,16 +40,16 @@
|
|
|
<select id="selectPageMyReceived" resultType="com.aizuda.boot.modules.flw.entity.vo.ProcessTaskVO">
|
|
|
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,i.end_time,i.duration
|
|
|
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)
|
|
|
+ WHERE EXISTS (SELECT 1 FROM flw_task_cc c WHERE i.id=c.instance_id AND c.actor_id=#{dto.createId})
|
|
|
<if test="dto.processName != null">
|
|
|
AND p.process_name LIKE CONCAT(CONCAT('%',#{dto.processName}),'%')
|
|
|
</if>
|
|
|
</select>
|
|
|
|
|
|
<select id="selectPageApproved" 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 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,i.end_time,i.duration
|
|
|
FROM flw_his_instance i LEFT JOIN flw_process p ON i.process_id=p.id
|
|
|
- WHERE EXISTS (SELECT 1 FROM flw_his_task c WHERE i.id=c.instance_id)
|
|
|
+ WHERE EXISTS (SELECT 1 FROM flw_his_task c JOIN flw_his_task_actor a ON c.id=a.task_id WHERE i.id=c.instance_id AND a.actor_id=#{dto.createId})
|
|
|
<if test="dto.processName != null">
|
|
|
AND p.process_name LIKE CONCAT(CONCAT('%',#{dto.processName}),'%')
|
|
|
</if>
|