bug fix

yuankang134 · yuankang134 · commit c07bdb8141e9 · 2024-03-06T17:42:31.000+08:00
diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceServiceImpl.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceServiceImpl.java
@@ -686,7 +686,7 @@ private void joinWorkspaceForNewUser(String userName, Long userId) {
             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.split("-")[0])) {
+                    if (org.equals(userOrgName) || orgName.equals(org)) {
                         needToAdd.add(new ImmutablePair<>(item.getWorkspaceId(), item.getRoleIds()));
                     }
                 });

Original file line number	Diff line number	Diff line change
`@@ -686,7 +686,7 @@ private void joinWorkspaceForNewUser(String userName, Long userId) {`
`686`	`686`	`String departments = item.getDepartments();`
`687`	`687`	`if (StringUtils.isNotBlank(departments) && StringUtils.isNotBlank(item.getRoleIds())) {`
`688`	`688`	`Arrays.stream(departments.split(",")).forEach(org -> {`
`689`		`- if (org.equals(userOrgName) \|\| orgName.equals(org.split("-")[0])) {`
	`689`	`+ if (org.equals(userOrgName) \|\| orgName.equals(org)) {`
`690`	`690`	`needToAdd.add(new ImmutablePair<>(item.getWorkspaceId(), item.getRoleIds()));`
`691`	`691`	`}`
`692`	`692`	`});`