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

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'

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>