Merge branch 'master' into docker_package

Merge branch 'dev'
HIQDUCS-757
2023-01-16 09:59:30 +08:00 · 2023-01-16 09:59:23 +08:00 · 2023-01-16 09:59:13 +08:00
1 changed files with 1 additions and 1 deletions
--- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
+++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
@ -1904,7 +1904,7 @@
            </otherwise>
        </choose>
        <if test="deptId != null and deptId != ''">
-            AND sd.name = #{deptId}
+            AND sd.id = #{deptId}
        </if>
        <if test="region != null and region != ''">
            AND sd.district = #{region}
Author	SHA1	Message	Date
wangliwen	db620ea454	Merge branch 'master' into docker_package	2023-01-16 09:59:30 +08:00
wangliwen	4a91e17e5e	Merge branch 'dev'	2023-01-16 09:59:23 +08:00
wangliwen	1cbeb17eee	HIQDUCS-757	2023-01-16 09:59:13 +08:00