|
|
@@ -611,6 +611,7 @@ public class TaskStatisticsServiceImpl implements TaskStatisticsService {
|
|
|
// 获取系统中的所有用户
|
|
|
LambdaQueryWrapper<SysUser> queryWrapperUser = new LambdaQueryWrapper<>();
|
|
|
queryWrapperUser.eq(SysUser :: getStatus,"1");
|
|
|
+ queryWrapperUser.notLike(SysUser::getId,"M");
|
|
|
List<SysUser> users = this.sysUserMapper.selectList(queryWrapperUser);
|
|
|
|
|
|
// 创建查询包装器,用于查询指定用户ID的用
|
|
|
@@ -623,6 +624,9 @@ public class TaskStatisticsServiceImpl implements TaskStatisticsService {
|
|
|
List<String> strIds = new ArrayList<>();
|
|
|
// 递归获取第一级下属及其所有下属的ID
|
|
|
findChildren(usersLevel1, users, strIds);
|
|
|
+ if(!strIds.contains(userId)){
|
|
|
+ strIds.add(userId);
|
|
|
+ }
|
|
|
return strIds;
|
|
|
}
|
|
|
|