Merge remote-tracking branch 'origin/main' into main

main
SondonYong 2025-12-05 14:18:31 +08:00
commit bf55c68f13
1 changed files with 2 additions and 5 deletions

View File

@ -332,15 +332,12 @@
OR u.corpinfo_id = ''
OR u.id != u.corpinfo_id
)
AND u.delete_enum = 'FALSE'
<if test="params.eqCorpinfoId != null">
AND (
(u.flow_flag = 0 AND u.corpinfo_id = #{params.eqCorpinfoId} )
(u.flow_flag = 0 AND u.corpinfo_id = #{params.eqCorpinfoId} and u.employment_flag !='3')
OR
(u.flow_flag = 1 AND cp.corpinfo_id = #{params.eqCorpinfoId} )
(u.flow_flag = 1 AND cp.corpinfo_id = #{params.eqCorpinfoId} and cp.employment_flag !='3')
)
</if>
<if test="params.eqDepartmentId != null and params.eqDepartmentId != ''">