提交 72bf1096 authored 作者: 黄承天's avatar 黄承天

fix(user): 修正由禅道同步来的数据中用户角色缺失的问题

上级 83239fc6
......@@ -49,13 +49,11 @@ public class TransHelper {
User user = userMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getAccount, ztUserView.getAccount()));
if (nonNull(user)) {
dataSourceService.switchDataSource("zentao");
Long userId = user.getId();
return toList(ztUserView.getProjects()).stream()
.map(Integer::parseInt)
.map(id -> ztProjectMapper.selectById(id))
.filter(ztProject -> Objects.equals("0", ztProject.getDeleted()))
.map(this::findProjectId)
.map(projectId -> new UserProject(null, userId, projectId, Strings.EMPTY))
.map(ztProject1 -> userProject(ztProject1,user))
.collect(Collectors.toList());
} else {
return new ArrayList<>();
......@@ -64,6 +62,19 @@ public class TransHelper {
//private---------------------------------------------------------------------------
private UserProject userProject(ZtProject ztProject,User user){
Long projectId = findProjectId(ztProject);
Long userId = user.getId();
String role = Role.NORMAL.getName();
if (Objects.equals(user.getAccount(),ztProject.getPm())){
role = Role.CREATOR.getName();
}
return new UserProject()
.setUserId(userId)
.setProjectId(projectId)
.setRole(role);
}
private Long findProjectId(ZtProject ztProject) {
if (nonNull(ztProject.getProject()) && ztProject.getProject() > 0) {
return Long.valueOf(ztProject.getProject());
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论