|
@@ -140,12 +140,9 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
|
|
|
//首选查角色类型
|
|
//首选查角色类型
|
|
|
List<SysRole> sysRoleList = sysRoleService.listByIds(roleIsList);
|
|
List<SysRole> sysRoleList = sysRoleService.listByIds(roleIsList);
|
|
|
List<String> userIdList = new ArrayList<>();
|
|
List<String> userIdList = new ArrayList<>();
|
|
|
|
|
+ List<Long> sysRoleOtherList = new ArrayList<>();
|
|
|
for (SysRole s : sysRoleList) {
|
|
for (SysRole s : sysRoleList) {
|
|
|
- if (s.getType() == RoleTypeEnum.ADMIN || s.getType() == RoleTypeEnum.PMO) {
|
|
|
|
|
- List<SysUserRole> sysUserRoleList = this.list(new QueryWrapper<SysUserRole>().lambda().in(SysUserRole::getRoleId, s.getId()));
|
|
|
|
|
- List<String> adminIdOrPmoIdList = sysUserRoleList.stream().map(i -> String.valueOf(i.getUserId())).collect(Collectors.toList());
|
|
|
|
|
- userIdList.addAll(adminIdOrPmoIdList);
|
|
|
|
|
- } else if (s.getType() == RoleTypeEnum.BUSSINESS) {
|
|
|
|
|
|
|
+ if (s.getType() == RoleTypeEnum.BUSSINESS) {
|
|
|
List<TBService> tbServiceList = tbServiceService.listByIds(Arrays.asList(serviceId));
|
|
List<TBService> tbServiceList = tbServiceService.listByIds(Arrays.asList(serviceId));
|
|
|
List<String> serviceLeadIdList = tbServiceList.stream().map(i -> String.valueOf(i.getServiceLeadId())).collect(Collectors.toList());
|
|
List<String> serviceLeadIdList = tbServiceList.stream().map(i -> String.valueOf(i.getServiceLeadId())).collect(Collectors.toList());
|
|
|
userIdList.addAll(serviceLeadIdList);
|
|
userIdList.addAll(serviceLeadIdList);
|
|
@@ -157,8 +154,15 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
|
|
|
List<TBCrm> tbCrmList = tbCrmService.list(new QueryWrapper<TBCrm>().lambda().eq(TBCrm::getServiceId, serviceId));
|
|
List<TBCrm> tbCrmList = tbCrmService.list(new QueryWrapper<TBCrm>().lambda().eq(TBCrm::getServiceId, serviceId));
|
|
|
List<String> regionCoordinatorIdList = tbCrmList.stream().map(i -> String.valueOf(i.getRegionCoordinatorId())).collect(Collectors.toList());
|
|
List<String> regionCoordinatorIdList = tbCrmList.stream().map(i -> String.valueOf(i.getRegionCoordinatorId())).collect(Collectors.toList());
|
|
|
userIdList.addAll(regionCoordinatorIdList);
|
|
userIdList.addAll(regionCoordinatorIdList);
|
|
|
|
|
+ } else {
|
|
|
|
|
+ sysRoleOtherList.add(s.getId());
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ if (!CollectionUtils.isEmpty(sysRoleOtherList)) {
|
|
|
|
|
+ List<SysUserRole> sysUserRoleList = this.list(new QueryWrapper<SysUserRole>().lambda().in(SysUserRole::getRoleId, sysRoleOtherList));
|
|
|
|
|
+ List<String> otherRoleUserList = sysUserRoleList.stream().map(i -> String.valueOf(i.getUserId())).collect(Collectors.toList());
|
|
|
|
|
+ userIdList.addAll(otherRoleUserList);
|
|
|
|
|
+ }
|
|
|
return userIdList;
|
|
return userIdList;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
wangliang