1.控制台树形优化

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

@@ -667,8 +667,8 @@ public class TaskStatisticsServiceImpl  implements TaskStatisticsService {
      **/
     @Override
     public IPage<BusinessAgentData> getBusinessAgentData(TaskStatisticsVo taskStatisticsVo) {
-        if(StringUtils.isNotEmpty(taskStatisticsVo.getTreeType())){
-            if(StringUtils.isNotEmpty(taskStatisticsVo.getTreeUserId()) && "2".equals(taskStatisticsVo.getTreeType())){
+        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);
@@ -840,8 +840,8 @@ public class TaskStatisticsServiceImpl  implements TaskStatisticsService {
         taskStatisticsVo.setCreatetimeEnd(dateMapByType.get("endDate"));
 
 
-        if(StringUtils.isNotEmpty(taskStatisticsVo.getTreeType())){
-            if(StringUtils.isNotEmpty(taskStatisticsVo.getTreeUserId()) && "2".equals(taskStatisticsVo.getTreeType())){
+        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);

src/main/resources/mapper/modules/admin/TaskStatisticsMapper.xml

@@ -252,12 +252,12 @@
 
 
 
-            <if test="vo.userIds  !=null  and vo.userIds!=''  and vo.userIds.size()>0">
-                and su.leader_id in
-                <foreach collection="vo.userIds" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
+<!--            <if test="vo.userIds  !=null  and vo.userIds!=''  and vo.userIds.size()>0">-->
+<!--                and su.leader_id in-->
+<!--                <foreach collection="vo.userIds" item="item" open="(" separator="," close=")">-->
+<!--                    #{item}-->
+<!--                </foreach>-->
+<!--            </if>-->
 
 <!--            <if test="vo.managementSource !=null  and vo.managementSource!=''">-->
 <!--                and sd.management_source=#{vo.managementSource}-->