wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
wangliwen 2022-10-13 23:08:01 +08:00
parent 2ca1096ecc 227db45035
commit e920447f39
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
View File

@ -1904,14 +1904,17 @@
AND su.dept_id = sd.id AND su.dept_id = sd.id
AND taa.resource_id = tdr.id AND taa.resource_id = tdr.id
AND dept.id = tdr.dept_id AND dept.id = tdr.dept_id
<choose> <!--<choose>
<when test="approveStatus != null and approveStatus != ''"> <when test="approveStatus != null and approveStatus != ''">
AND taa.approve_status = #{approveStatus} AND taa.approve_status = #{approveStatus}
</when> </when>
<otherwise> <otherwise>
AND taa.approve_status != '不通过' AND taa.approve_status != '不通过'
</otherwise> </otherwise>
</choose> </choose> -->
<if test="approveStatus != null and approveStatus != ''">
AND taa.approve_status = #{approveStatus}
</if>
<if test="deptId != null and deptId != ''"> <if test="deptId != null and deptId != ''">
AND sd.id = #{deptId} AND sd.id = #{deptId}
</if> </if>