|
|
@@ -37,8 +37,8 @@
|
|
|
SELECT i.process_id,p.process_name,p.process_type,i.id AS instance_id,i.instance_state,i.create_by AS launch_by,i.create_time AS launch_time,
|
|
|
t.id AS task_id,t.create_time,t.task_name,t.task_key,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||''=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||''=f.actor_id WHERE f.actor_type=2 AND r.user_id=#{dto.userId})
|
|
|
+ WHERE a.id IN (SELECT f.id FROM flw_task_actor f JOIN sys_user_role r ON CONCAT(r.role_id)=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 CONCAT(r.department_id)=f.actor_id WHERE f.actor_type=2 AND r.user_id=#{dto.userId})
|
|
|
<include refid="sqlConditionProcessTask"></include>
|
|
|
</select>
|
|
|
|
|
|
@@ -76,7 +76,7 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="selectListHisTaskActorVOByInstanceId" resultType="com.aizuda.boot.modules.flw.entity.vo.FlwHisTaskActorVO">
|
|
|
- SELECT a.task_id,a.actor_name,(SELECT avatar FROM sys_user WHERE id||''=a.actor_id) AS avatar,a.weight
|
|
|
+ SELECT a.task_id,a.actor_name,(SELECT avatar FROM sys_user WHERE CONCAT(id)=a.actor_id) AS avatar,a.weight
|
|
|
FROM flw_his_task_actor a WHERE a.instance_id=#{instanceId}
|
|
|
</select>
|
|
|
|
hubin