1.控制台调整

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -2143,7 +2143,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             return this.findTree();
         } else {
             //获取领导字段不为空的人的ID
-            List<SysUser> users = lambdaQuery().isNotNull(SysUser::getLeaderId).list();
+            QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+            queryWrapper.isNotNull("leader_id")
+                    .eq("status", "1");
+            List<SysUser> users = sysUserMapper.selectList(queryWrapper);
             if (users == null || users.size() == 0) {
                 return new ArrayList<>();
             }

src/main/java/com/ydtech/modules/admin/service/impl/TaskStatisticsServiceImpl.java

@@ -670,7 +670,7 @@ public class TaskStatisticsServiceImpl  implements TaskStatisticsService {
         if(StringUtils.isNotEmpty(taskStatisticsVo.getTreeType()) || "3".equals(taskStatisticsVo.getManagementSource())){
             if((StringUtils.isNotEmpty(taskStatisticsVo.getTreeUserId()) && "2".equals(taskStatisticsVo.getTreeType())) ||"3".equals(taskStatisticsVo.getManagementSource()) ){
                 List<String> userIds=this.getNextLevel(taskStatisticsVo.getTreeUserId());
-                if(!userIds.isEmpty()){
+                if(!userIds.isEmpty() && userIds.get(0)!=null){
                     taskStatisticsVo.setUserIds(userIds);
                 }else {
                     taskStatisticsVo.setUserId(taskStatisticsVo.getTreeUserId());
@@ -843,8 +843,8 @@ public class TaskStatisticsServiceImpl  implements TaskStatisticsService {
         if(StringUtils.isNotEmpty(taskStatisticsVo.getTreeType()) || "3".equals(taskStatisticsVo.getManagementSource())){
             if((StringUtils.isNotEmpty(taskStatisticsVo.getTreeUserId()) && "2".equals(taskStatisticsVo.getTreeType())) ||"3".equals(taskStatisticsVo.getManagementSource()) ){
                 List<String> userIds=this.getNextLevel(taskStatisticsVo.getTreeUserId());
-                if(!userIds.isEmpty()){
-                    taskStatisticsVo.setUserIds(userIds);
+                if(!userIds.isEmpty() && userIds.get(0)!=null){
+                         taskStatisticsVo.setUserIds(userIds);
                 }else {
                     taskStatisticsVo.setUserId(taskStatisticsVo.getTreeUserId());
                 }