1

src/main/java/com/fdkankan/sale/controller/SysUserController.java

@@ -100,7 +100,7 @@ public class SysUserController extends BaseController{
      */
     @GetMapping("/getByRoleType")
     public ResultData getByRoleType(@RequestParam(required = false,defaultValue = "1") Integer roleType){
-        return ResultData.ok(sysUserService.getByRoleType(roleType));
+        return ResultData.ok(sysUserService.getByRoleType(roleType,true));
     }
 }
 

src/main/java/com/fdkankan/sale/service/ISysUserService.java

@@ -50,6 +50,7 @@ public interface ISysUserService extends IService<SysUser> {
     void updateUser(SysUserParam param);
 
     List<SysUser> getByRoleType(Integer roleType);
+    List<SysUser> getByRoleType(Integer roleType,Boolean hasMe);
 
     Long getU8UserId();
 

src/main/java/com/fdkankan/sale/service/impl/SysUserServiceImpl.java

@@ -258,10 +258,25 @@ public class SysUserServiceImpl extends ServiceImpl<ISysUserMapper, SysUser> imp
         List<Long> collect = roles.stream().map(SysRole::getId).collect(Collectors.toList());
         LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<>();
         wrapper.in(SysUser::getRoleId,collect);
+        return this.list(wrapper);
+    }
+
+    @Override
+    public List<SysUser> getByRoleType(Integer roleType,Boolean hasMe) {
+        List<SysRole> roles = roleService.getByRoleType(roleType);
+        if(roles == null || roles.size()<=0){
+            return null;
+        }
+        List<Long> collect = roles.stream().map(SysRole::getId).collect(Collectors.toList());
+        LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(SysUser::getRoleId,collect);
         List<SysUser> list = this.list(wrapper);
-        SysUser byId = sysUserService.getById((Long) StpUtil.getLoginId());
-        if(!list.stream().map(SysUser::getId).collect(Collectors.toList()).contains(byId.getId())){
-            list.add(byId);
+        if(hasMe){
+            SysUser byId = sysUserService.getById((Long) StpUtil.getLoginId());
+            List<Long> collect1 = list.stream().map(SysUser::getId).collect(Collectors.toList());
+            if(!collect1.contains(byId.getId())){
+                list.add(byId);
+            }
         }
         return list;
     }