user4 5 роки тому
батько
коміт
9b4e4973a2

+ 1 - 1
src/main/resources/mappings/modules/workactivity/WorkActivityProcessDao.xml

@@ -110,7 +110,7 @@
 		LEFT JOIN work_activity w ON w.process_key = a.process_key and w.count = a.count
 		<include refid="workActivityProcessJoins"/>
 		<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 != ''">
 				and a.process_instance_id = #{processInstanceId}
 			</if>