|
@@ -110,7 +110,7 @@
|
|
|
LEFT JOIN work_activity w ON w.process_key = a.process_key and w.count = a.count
|
|
LEFT JOIN work_activity w ON w.process_key = a.process_key and w.count = a.count
|
|
|
<include refid="workActivityProcessJoins"/>
|
|
<include refid="workActivityProcessJoins"/>
|
|
|
<where>
|
|
<where>
|
|
|
- a.del_flag = #{DEL_FLAG_NORMAL}
|
|
|
|
|
|
|
+ a.del_flag = #{DEL_FLAG_NORMAL} and w.del_flag = #{DEL_FLAG_NORMAL}
|
|
|
<if test="processInstanceId != null and processInstanceId != ''">
|
|
<if test="processInstanceId != null and processInstanceId != ''">
|
|
|
and a.process_instance_id = #{processInstanceId}
|
|
and a.process_instance_id = #{processInstanceId}
|
|
|
</if>
|
|
</if>
|
user4