|
@@ -597,8 +597,17 @@ public class TBUserArchivesAllocationServiceImpl
|
|
|
switch (sopRoleTypeCompositeEnum) {
|
|
|
case ENGINEER:
|
|
|
case PROJECT_MANAGER:
|
|
|
- datasource = tbUserArchivesService.list().stream().map(TBUserArchives::getId).distinct()
|
|
|
- .collect(Collectors.toList());
|
|
|
+ switch (productTypeEnum) {
|
|
|
+ case OFFICE:
|
|
|
+ datasource = tbUserArchivesService.list().stream().map(TBUserArchives::getId).distinct()
|
|
|
+ .collect(Collectors.toList());
|
|
|
+ break;
|
|
|
+ case CLOUD_MARK:
|
|
|
+ datasource = tbUserArchivesService.findArchivesSourceByType(
|
|
|
+ new HashSet<>(Arrays.asList(RoleTypeEnum.EFFECT_ENGINEER, RoleTypeEnum.ASSISTANT_ENGINEER)))
|
|
|
+ .stream().map(ArchivesSourceResult::getArchivesId).distinct().collect(Collectors.toList());
|
|
|
+ break;
|
|
|
+ }
|
|
|
break;
|
|
|
case REGION_COORDINATOR:
|
|
|
datasource = tbUserArchivesService.findArchivesSourceByType(
|