From 4ddb3bb61b22faa7cbd76af89147f199123a0b0a Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 28 Apr 2020 11:09:55 +0800
Subject: [PATCH 1/2] CustomerStaff

---
 .../src/main/resources/mapper/CustomerStaffDepartmentDao.xml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml
index 09271d9e95..7702cf9aa0 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml
@@ -34,7 +34,7 @@
             <if test='null != updatedBy and "" != updatedBy'>
                 UPDATED_BY = #{updatedBy},
             </if>
-                UPDATED_DATE = NOW()
+                UPDATED_TIME = NOW()
         </set>
         WHERE
         DEL_FLAG = '0'

From 9ce29f508ddc9af6ffdd416477f06ad45b2bf0d5 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 28 Apr 2020 11:19:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?listStaffIdsByRoleKeyAndOrgId=20sql?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/StaffRoleDao.xml                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml
index b70e0e318b..6cbb4c047d 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml
@@ -34,7 +34,7 @@
         WHERE
             r.ROLE_KEY = #{roleKey}
             AND sr.ORG_ID = #{orgId}
-            AND r.DEL_FLAG = '0'
+            AND sr.DEL_FLAG = '0'
             AND r.DEL_FLAG = '0'
     </select>