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:
QYTHINK\qiaoy 2023-01-16 10:13:10 +08:00
parent 346284ae26 1cbeb17eee
commit 45dc1bad08
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1904,7 +1904,7 @@
</otherwise> </otherwise>
</choose> </choose>
<if test="deptId != null and deptId != ''"> <if test="deptId != null and deptId != ''">
AND sd.name = #{deptId} AND sd.id = #{deptId}
</if> </if>
<if test="region != null and region != ''"> <if test="region != null and region != ''">
AND sd.district = #{region} AND sd.district = #{region}