修改网格员列表bug

4 years ago · 30049acc81
3 changed files with 4 additions and 4 deletions
--- a/epdc-cloud-admin/src/main/resources/mapper/SysUserDao.xml
+++ b/epdc-cloud-admin/src/main/resources/mapper/SysUserDao.xml
@ -228,9 +228,9 @@
            sys_user u
            LEFT JOIN sys_epmet_user_relation eur on u.id = eur.sys_user_id
        WHERE
-            U.DEL_FLAG = 0
+            u.DEL_FLAG = 0
            AND eur.DEL_FLAG = 0
-            AND eur.AGENCY_ID = #{deptId}
+            AND u.`dept_id` = #{deptId}
        ORDER BY
            eur.CREATED_TIME DESC
        LIMIT #{pageIndex}, #{pageSize}
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 40bd0613d9f3dd621d327713e3d7f15c656570f3
+Subproject commit 037ee6574bf347ae34d5251735a99c5511d81794
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 31d32c81a8018a5c93745bcca1a538cc0bf59e13
+Subproject commit 9d7cf7e81ccc634751f032f72e5333a90eb40ee2