|
|
@@ -239,7 +239,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
action.setDefaultSelected(true);
|
|
|
}
|
|
|
String typeAttr = attrTypeMap.getOrDefault(action.getId(),null);
|
|
|
- action.setTypeAttr(typeAttr);
|
|
|
+ // 在【业务员管理页面】 要求类型中,不展示1,2,3,4 对应的类型
|
|
|
+ if(StrUtil.isNotEmpty(typeAttr)){
|
|
|
+ Set<String> set = Set.of("1","2","3");
|
|
|
+ typeAttr = Arrays.stream(typeAttr.split(",")).filter(action1-> !set.contains(action1)).collect(Collectors.joining(","));
|
|
|
+ action.setTypeAttr(typeAttr);
|
|
|
+ }
|
|
|
List<SysRole> userRole = sysUserRoleService.getUserRole(action.getUserId());
|
|
|
if(CollectionUtil.isNotEmpty(userRole)){
|
|
|
String roleNames = userRole.stream().map(SysRole::getName).distinct().collect(Collectors.joining(","));
|