Procházet zdrojové kódy

fix: 查询项目成员返回gitlabid而不是门户id

370774330@qq.com před 5 roky
rodič
revize
cd171b7926

+ 4 - 0
seecoder-gitlab-server/src/main/java/com/nju/edu/gitlab/repository/GitlabUserRepository.java

@@ -4,7 +4,11 @@ import com.nju.edu.gitlab.entity.GitlabUser;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface GitlabUserRepository extends JpaRepository<GitlabUser,Integer> {
     public GitlabUser findByUserId(int userId);
+
+    List<GitlabUser> findAllByGitlabUserIdIn(List<Integer> ids);
 }

+ 4 - 1
seecoder-gitlab-server/src/main/java/com/nju/edu/gitlab/service/impl/ProjectServiceImpl.java

@@ -244,7 +244,10 @@ public class ProjectServiceImpl implements ProjectService {
 
     @Override
     public List<Integer> getProjectJoinedUserId(int projectId) throws GitLabApiException {
-        return gitlabApi.getProjectApi().getMembers(projectId).stream().map(Member::getId).collect(Collectors.toList());
+        List<Integer> gitlabUserIds = gitlabApi.getProjectApi().getMembers(projectId).stream().map(Member::getId).collect(Collectors.toList());
+        return gitlabUserRepository.findAllByGitlabUserIdIn(gitlabUserIds).stream()
+                .map(GitlabUser::getUserId)
+                .collect(Collectors.toList());
     }
 
     private BranchVO castBranchToVO(Branch branch) {