Merge remote-tracking branch 'origin/developer' into developer

gic-platform-auth-service/src/main/resources/mapper/TabSysUserMapper.xml

@@ -232,8 +232,8 @@
     a.user_name userName,
     a.phone_number phoneNumber,
     a.phone_area_code phoneAreaCode,
-    (select GROUP_CONCAT(role_name separator '/') from tab_sys_role where role_id in (GROUP_CONCAT(b.role_id))) userRoleNames,
-    (select GROUP_CONCAT(d.resource_name separator '/') from  tab_sys_resource d WHERE find_in_set( d.resource_Id , GROUP_CONCAT(c.resource_id)) ) userResourceNames
+    (select GROUP_CONCAT(role_name separator '/') from tab_sys_role where find_in_set( role_id , GROUP_CONCAT(b.role_id)) ) userRoleNames,
+    (select GROUP_CONCAT(d.resource_name separator '/') from  tab_sys_resource d WHERE find_in_set( d.resource_id , GROUP_CONCAT(c.resource_id)) ) userResourceNames
     from tab_sys_user a
     left join tab_sys_user_role b on a.user_id = b.user_id
     left join tab_sys_user_resource c on a.user_id = c.user_id