|
|
|
@ -247,14 +247,18 @@
|
|
|
|
|
tc.*
|
|
|
|
|
from ocr_taskchild_picture tc
|
|
|
|
|
where tc.ASSIGNEE = #{searchassignee} and tc.TENANTID=#{searchtenantid}
|
|
|
|
|
and tc.STATES=2
|
|
|
|
|
UNION
|
|
|
|
|
select
|
|
|
|
|
tc.*
|
|
|
|
|
from ocr_taskchild_picture tc,OA_USERAPPROVE_T uf
|
|
|
|
|
where tc.ID = uf.FORMID and tc.TENANTID=#{searchtenantid}
|
|
|
|
|
<if test="thisLoginUserid != null"> and uf.USERID = #{thisLoginUserid}</if>
|
|
|
|
|
<if test="thisLoginUserid != null">
|
|
|
|
|
and uf.USERID = #{thisLoginUserid}
|
|
|
|
|
</if>
|
|
|
|
|
) as tcp
|
|
|
|
|
<include refid="Base_Where_union"></include>
|
|
|
|
|
<include refid="Base_Where_union">
|
|
|
|
|
</include>
|
|
|
|
|
</select>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|