agms团队寿险数据问题4

yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsDashboardServiceImpl.java

@@ -176,7 +176,7 @@ public class AgmsDashboardServiceImpl implements AgmsDashboardService {
     private List<Achieve> queryN22(String category, String type, String time) throws Exception {
         // 0.声明变量
         SearchStaffAchievementResponseVO searchStaffAchievementResponseVO = null;
-        List<Achieve> achieveList = new ArrayList<>();
+        List<Achieve> resultList = new ArrayList<>();
 
         // 1.获取机构id
         this.getGroupIdByThisInterface();
@@ -210,6 +210,9 @@ public class AgmsDashboardServiceImpl implements AgmsDashboardService {
 
         if ("life".equals(category)) {
             if ("b".equals(type)) {
+
+                List<Achieve> achieveList = new ArrayList<>();
+
                 searchStaffAchievementRequestBody.setIsdown("1");
                 // 循环查分公司
                 for (String organizationId : organizationIdList) {
@@ -230,7 +233,11 @@ public class AgmsDashboardServiceImpl implements AgmsDashboardService {
                     achieveList.addAll(achieves);
                 }
 
+                resultList = achieveList;
+
             } else {
+                List<Achieve> achieveList = new ArrayList<>();
+
                 // 查团队
                 searchStaffAchievementRequestBody.setSearchtype("2");
                 searchStaffAchievementRequestBody.setIsdown("1");
@@ -242,6 +249,7 @@ public class AgmsDashboardServiceImpl implements AgmsDashboardService {
                     List<Achieve> achieves = n22SalaryService.searchStaffAchievementGetAchieveList(searchStaffAchievementResponseVO);
                     achieveList.addAll(achieves);
                 }
+                resultList = achieveList;
             }
         } else if ("all".equals(category)) {
             searchStaffAchievementRequestBody.setOrganization_id("HX6ZCQ");
@@ -249,10 +257,11 @@ public class AgmsDashboardServiceImpl implements AgmsDashboardService {
             searchStaffAchievementRequestBody.setIsdown("1");
 
             searchStaffAchievementResponseVO = n22SalaryService.searchStaffAchievement(searchStaffAchievementRequestBody);
-            achieveList = n22SalaryService.searchStaffAchievementGetAchieveList(searchStaffAchievementResponseVO);
+            resultList = n22SalaryService.searchStaffAchievementGetAchieveList(searchStaffAchievementResponseVO);
+
         }
 
-        return achieveList;
+        return resultList;
     }
 
     /**