code optimize

Author: yuankang134

dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/dao/DSSWorkspaceUserMapper.java

@@ -60,9 +60,9 @@ void insertUserRoleInWorkspace(@Param("workspaceId") long workspaceId, @Param("r
 
     @Select({
             "<script>",
-            "select created_by as creator, username as username, create_time as joinTime, workspace_id as workspaceId, group_concat(DISTINCT role_id) as roleIds, update_time as updateTime, update_user as updateUser " +
+            "select created_by as creator, username as username, create_time as joinTime, workspace_id as workspaceId, group_concat(role_id) as roleIds, update_time as updateTime, update_user as updateUser " +
                     "from dss_workspace_user_role where workspace_id = #{workspaceId} ",
-            "<if test='username != null'>and username like concat('%',#{username},'%')</if> " + "group by username " +
+            "<if test='username != null'>and username like concat('%',#{username},'%')</if> " + "group by username,created_by,create_time,workspace_id,update_time,update_user " +
                     "<if test='roleId != null'>HAVING FIND_IN_SET(#{roleId},roleIds)</if> " +
                     "order by id desc",
             "</script>"

dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceServiceImpl.java

@@ -683,20 +683,24 @@ private void joinWorkspaceForNewUser(String userName, Long userId) {
         String userOrgName = staffInfoGetter.getFullOrgNameByUsername(userName);
         String orgName = userOrgName.split("-")[0];
         List<DSSWorkspaceAssociateDepartments> workspaceAssociateDepartments = dssWorkspaceMapper.getWorkspaceAssociateDepartments();
-        Set<ImmutablePair<Long, String>> needToAdd = new HashSet<>();
+        Set<Map<Long, String>> needToAdd = new HashSet<>();
         for (DSSWorkspaceAssociateDepartments item : workspaceAssociateDepartments) {
             String departments = item.getDepartments();
             if (StringUtils.isNotBlank(departments) && StringUtils.isNotBlank(item.getRoleIds())) {
                 Arrays.stream(departments.split(",")).forEach(org -> {
                     if (org.equals(userOrgName) || orgName.equals(org)) {
-                        needToAdd.add(new ImmutablePair<>(item.getWorkspaceId(), item.getRoleIds()));
+                        Map<Long, String> pair = new HashMap<>();
+                        pair.put(item.getWorkspaceId(), item.getRoleIds());
+                        needToAdd.add(pair);
                     }
                 });
             }
         }
-        needToAdd.forEach(pair -> {
-            Arrays.stream(pair.getValue().split(",")).forEach(roleId -> {
-                dssWorkspaceUserMapper.insertUserRoleInWorkspace(pair.getKey().intValue(), Integer.parseInt(roleId),new Date(), userName, "system", userId, "system");
+        needToAdd.forEach(map -> {
+            map.forEach((key, value) -> {
+                Arrays.stream(value.split(",")).forEach(roleId -> {
+                    dssWorkspaceUserMapper.insertUserRoleInWorkspace(key.intValue(), Integer.parseInt(roleId), new Date(), userName, "system", userId, "system");
+                });
             });
         });
     }