Merge remote-tracking branch 'origin/master'

yt-agent/agent-service/src/main/java/com/ytpm/controller/AgentIndexController.java

@@ -164,7 +164,8 @@ public class AgentIndexController {
         List<AgentAppView> agentAppViews = agentAppService.searchAppIdList(appListParam);
         ArrayList<String> list = new ArrayList<>();
         if (CollUtil.isNotEmpty(agentAppViews)) {
-          param.setApp_id_list(agentAppViews.stream().map(AgentAppView::getAppId).collect(Collectors.toList()));
+            //获取的是superiorId
+          param.setApp_id_list(agentAppViews.stream().map(AgentAppView::getSuperiorId).collect(Collectors.toList()));
         }
         else {
             param.setApp_id_list(list);
@@ -336,7 +337,7 @@ public class AgentIndexController {
             List<AgentAppView> agentAppViews = agentAppService.searchAppIdList(appListParam);
             List<String> appIdList;
             if (CollUtil.isNotEmpty(agentAppViews)){
-                appIdList = agentAppViews.stream().map(AgentAppView::getAppId).collect(Collectors.toList());
+                appIdList = agentAppViews.stream().map(AgentAppView::getSuperiorId).collect(Collectors.toList());
             }
             else {
                 return Result.resultObjOk(indexHourReportViews);
@@ -414,7 +415,7 @@ public class AgentIndexController {
         List<String> appIdList = null;
         List<AgentAppView> agentAppViews = agentAppService.searchAppIdList(appListParam);
         if (CollUtil.isNotEmpty(agentAppViews)){
-            appIdList = agentAppViews.stream().map(AgentAppView::getAppId).collect(Collectors.toList());
+            appIdList = agentAppViews.stream().map(AgentAppView::getSuperiorId).collect(Collectors.toList());
         }
         processPeriodData(result, "today",
                 DateUtil.getTodayStart(),

yt-agent/agent-service/src/main/resources/mapper/AgentAppMapper.xml

@@ -82,7 +82,7 @@
     </select>
 
     <select id="searchAppIdList" resultType="com.ytpm.agent.view.AgentAppView">
-        select app_id from yt_app  where user_id =#{userId}
+        select superior_id from yt_app  where user_id =#{userId}
     </select>
     <select id="getIssuedAppList" resultType="com.ytpm.agent.model.YtPlatformUserApp">
         select