Эх сурвалжийг харах

资料填报上报,上报人分类获取不了

qianxb 2 жил өмнө
parent
commit
929e6083d7

+ 10 - 0
blade-service/blade-manager/src/main/java/org/springblade/manager/feign/ProjectAssignmentUserClientImpl.java

@@ -41,6 +41,16 @@ public class ProjectAssignmentUserClientImpl implements ProjectAssignmentUserCli
                                     Function.identity(),
                                     Function.identity(),
                                     (dto1, dto2) -> dto1))
                                     (dto1, dto2) -> dto1))
                             .values());
                             .values());
+                }else {
+                    List<SaveUserInfoByProjectDTO> list = this.saveUserInfoByProjectService.list(Wrappers.<SaveUserInfoByProjectDTO>lambdaQuery().eq(SaveUserInfoByProjectDTO::getContractId, contractId).eq(SaveUserInfoByProjectDTO::getIsDeleted, 0));
+                    //根据roleId、userId去重
+                    return new ArrayList<>(list.stream()
+                            .collect(Collectors.toMap(
+                                    dto -> dto.getRoleId() + "-" + dto.getUserId(),
+                                    Function.identity(),
+                                    (dto1, dto2) -> dto1))
+                            .values());
+
                 }
                 }
             } else if (contractInfo.getContractType() == 2 || contractInfo.getContractType() == 3) {
             } else if (contractInfo.getContractType() == 2 || contractInfo.getContractType() == 3) {
                 //如果本身就是监理合同段,那么不处理,返回本身合同段信息
                 //如果本身就是监理合同段,那么不处理,返回本身合同段信息