user auto join by department

Author: yuankang134

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

@@ -29,5 +29,6 @@ public interface StaffInfoGetter {
 
     List<String> getAllDepartments();
 
+    StaffInfo getStaffInfoByUsername(String username);
 
 }

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

@@ -676,14 +676,16 @@ public PageInfo<DSSUserRoleComponentPriv> getAllUserPrivs(Integer currentPage, I
     }
 
     private void joinWorkspaceForNewUser(String userName, Long userId) {
-        String userOrgName = staffInfoGetter.getFullOrgNameByUsername(userName);
+        StaffInfo staffInfo = staffInfoGetter.getStaffInfoByUsername(userName);
+        String userOrgName = (staffInfo == null) ? staffInfoGetter.getFullOrgNameByUsername(userName): staffInfo.getOrgFullName();
+        String orgName = staffInfo.getOrgName();
         List<DSSWorkspaceAssociateDepartments> workspaceAssociateDepartments = dssWorkspaceMapper.getWorkspaceAssociateDepartments();
         Set<ImmutablePair<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)) {
+                    if (org.equals(userOrgName) || orgName.equals(org.contains("-")?org.split("-")[0]:org)) {
                         needToAdd.add(new ImmutablePair<>(item.getWorkspaceId(), item.getRoleIds()));
                     }
                 });

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

@@ -44,4 +44,9 @@ public List<String> getAllDepartments() {
         List<String> allDepartments = Arrays.asList("WeDataSphere-linkisGroup");
         return allDepartments;
     }
+
+    @Override
+    public StaffInfo getStaffInfoByUsername(String username) {
+        return new StaffInfo();
+    }
 }