2/28

RMS/src/main/java/cn/cslg/report/service/business/ReportService.java

@@ -196,7 +196,7 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
         List<ClientVO> mapClients = new ArrayList<>();
         if (clientIds.size() != 0) {
             String res3 = outInterfaceService.getClientNameFromPCS(clientIds);
-            mapClients = JSONObject.parseArray(res3);
+            mapClients = JSONObject.parseArray(res3, ClientVO.class);
         }
         //过滤报告
         for (Report item : reports) {
@@ -216,11 +216,11 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
                 item.setClientId(0);
             }
             //装载客户
-      for(ClientVO clientVO :mapClients){
-          if(clientVO.getId().equals(item.getClientId())) {
-              item.setClientName(clientVO.getName() );
-          }
-      }
+            for (ClientVO clientVO : mapClients) {
+                if (clientVO.getId().equals(item.getClientId())) {
+                    item.setClientName(clientVO.getName());
+                }
+            }
             //装载报告应用场景
             if (StringUtils.isNotEmpty(item.getScenarioId())) {
                 item.setScenarioList(StringUtils.changeStringToString(item.getScenarioId(), ","));