|
@@ -41,6 +41,16 @@ public class ProjectAssignmentUserClientImpl implements ProjectAssignmentUserCli
|
|
|
Function.identity(),
|
|
|
(dto1, dto2) -> dto1))
|
|
|
.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) {
|
|
|
//如果本身就是监理合同段,那么不处理,返回本身合同段信息
|