Skip to content

Commit 2137459

Browse files
author
xlinliu
committed
权限被清理的项目,也能被拉出来,不要报错
1 parent 14a94a0 commit 2137459

File tree

1 file changed

+16
-17
lines changed
  • dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl

1 file changed

+16
-17
lines changed

dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -282,23 +282,22 @@ public List<ProjectResponse> getListByParam(ProjectQueryRequest projectRequest)
282282
}
283283

284284
String pusername = projectVo.getPusername();
285-
String editPriv = projectVo.getId() + KEY_SPLIT + ProjectUserPrivEnum.PRIV_EDIT.getRank()
286-
+ KEY_SPLIT + projectRequest.getUsername();
287-
288-
LOGGER.info("user:{} get project privilege info ,workspaceId:{}, projectId:{}, projectName:{}, pusername:{}, editPriv:{}",
289-
projectRequest.getUsername(), projectRequest.getWorkspaceId(), projectVo.getId(), projectVo.getName(), pusername, editPriv);
290-
291-
Map<String, List<String>> userPricMap = new HashMap<>();
292-
String[] tempstrArr = pusername.split(MODE_SPLIT);
293-
294-
// 拆分有projectId +"-" + priv + "-" + username的拼接而成的字段,
295-
// 从而得到:查看权限用户、编辑权限用户、发布权限用a
296-
for (String s : tempstrArr) {
297-
String[] strArr = s.split(KEY_SPLIT);
298-
if (strArr.length >= 3) {
299-
String key = strArr[0] + KEY_SPLIT + strArr[1];
300-
userPricMap.computeIfAbsent(key, k -> new ArrayList<>());
301-
userPricMap.get(key).add(strArr[2]);
285+
if (StringUtils.isNotEmpty(pusername)) {
286+
String editPriv = projectVo.getId() + KEY_SPLIT + ProjectUserPrivEnum.PRIV_EDIT.getRank()
287+
+ KEY_SPLIT + projectRequest.getUsername();
288+
LOGGER.info("user:{} get project privilege info ,workspaceId:{}, projectId:{}, projectName:{}, pusername:{}, editPriv:{}",
289+
projectRequest.getUsername(), projectRequest.getWorkspaceId(), projectVo.getId(), projectVo.getName(), pusername, editPriv);
290+
Map<String, List<String>> userPricMap = new HashMap<>();
291+
String[] tempstrArr = pusername.split(MODE_SPLIT);
292+
// 拆分有projectId +"-" + priv + "-" + username的拼接而成的字段,
293+
// 从而得到:查看权限用户、编辑权限用户、发布权限用a
294+
for (String s : tempstrArr) {
295+
String[] strArr = s.split(KEY_SPLIT);
296+
if (strArr.length >= 3) {
297+
String key = strArr[0] + KEY_SPLIT + strArr[1];
298+
userPricMap.computeIfAbsent(key, k -> new ArrayList<>());
299+
userPricMap.get(key).add(strArr[2]);
300+
}
302301
}
303302
}
304303
List<String> accessUsers = userPricMap.get(projectVo.getId() + KEY_SPLIT + ProjectUserPrivEnum.PRIV_ACCESS.getRank());

0 commit comments

Comments
 (0)