cq_anquan
/
safety-eval-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-tmp1' into dev-tmp1

dev-tmp1
luotaiqian 2026-08-18 10:14:02 +08:00
parent 59f1b776d9 b135925b95
commit 65913418f7
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProjectExecutor.java
View File

@ -294,16 +294,22 @@ public class EvalProjectExecutor implements EvalProjectApi {
* @return * @return
*/ */
public Map<Long, String> getProjectRole(List<Long> projectIds) { public Map<Long, String> getProjectRole(List<Long> projectIds) {
List<EvalProjectMemberDO> evalProjectMemberDOS = evalProjectMemberMapper.selectList(new LambdaQueryWrapper<EvalProjectMemberDO>() List<EvalProjectMemberDO> evalProjectMemberDOS = new ArrayList<>();
.eq(EvalProjectMemberDO::getProjectId, projectIds) for (Long projectId : projectIds) {
.eq(EvalProjectMemberDO::getPersonnelId, AuthUserContextAdapter.getCurrentUserId())); List<EvalProjectMemberDO> evalProjectMembers = evalProjectMemberMapper.selectList(new LambdaQueryWrapper<EvalProjectMemberDO>()
.eq(EvalProjectMemberDO::getProjectId, projectId)
.eq(EvalProjectMemberDO::getPersonnelId, AuthUserContextAdapter.getCurrentUserId()));
if (!CollectionUtils.isEmpty(evalProjectMembers)) {
evalProjectMemberDOS.addAll(evalProjectMembers);
}
}
if (CollectionUtils.isEmpty(evalProjectMemberDOS)) { if (CollectionUtils.isEmpty(evalProjectMemberDOS)) {
return null; return null;
} }
for (EvalProjectMemberDO evalProjectMemberDO : evalProjectMemberDOS) { for (EvalProjectMemberDO evalProjectMemberDO : evalProjectMemberDOS) {
evalProjectMemberDO.setRole(ProjectRoleEnum.fromVals(evalProjectMemberDO.getRole())); evalProjectMemberDO.setRole(ProjectRoleEnum.fromVals(evalProjectMemberDO.getRole()));
} }
return evalProjectMemberDOS.stream().collect(Collectors.toMap(EvalProjectMemberDO::getId, EvalProjectMemberDO::getRole)); return evalProjectMemberDOS.stream().collect(Collectors.toMap(EvalProjectMemberDO::getProjectId, EvalProjectMemberDO::getRole));
} }
@Override @Override