From 3868221a2532055294d55a4514f042b7a3c1e41f Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Mon, 10 Dec 2018 18:16:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=85=8D=E7=BD=AEID=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E9=93=BE=E6=8E=A5=E6=9C=89=E6=97=A0=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=97=B6=E9=83=BD=E6=B7=BB=E5=8A=A0=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/NtcPzReportController.java         | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/report/NtcPzReportController.java b/src/main/java/com/nis/web/controller/report/NtcPzReportController.java
index f45fa5a32..5eaa30c8a 100644
--- a/src/main/java/com/nis/web/controller/report/NtcPzReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcPzReportController.java
@@ -116,22 +116,21 @@ public class NtcPzReportController extends BaseController{
 		String json=ConfigServiceUtil.getReport(Constants.BUSINESSTYPE_CONFIG, compileIds, serviceIds, startDate==null?null:sdf.format(startDate), endDate==null?null:sdf.format(endDate));
 		List<NtcPzReport> list=getList(json);
 		String[] idArr=compileIds.split(",");
-		if(list!=null&&(list.size()>0)){
-			for(NtcPzReport report:list) {
-				Map<String, Object> data=new HashMap<String, Object>();
-				data.put("compileId", report.getCfgId().longValue());
-				data.put("sum",report.getSum().longValue());
-				dataList.add(data);
-			}
-		}else {
-			for(String id:idArr) {
-				Map<String, Object> data=new HashMap<String, Object>();
-				data.put("compileId", id);
-				data.put("sum",0);
-				dataList.add(data);
+		for(String id:idArr) {
+			Map<String, Object> data=new HashMap<String, Object>();
+			data.put("compileId", id);
+			Long sum=(long) 0;
+			if(list!=null&&(list.size()>0)){
+				for(NtcPzReport report:list) {
+					if(Long.valueOf(id).longValue() == report.getCfgId().longValue()){
+						sum=report.getSum().longValue();
+						break;
+					}
+				}
 			}
+			data.put("sum",sum);
+			dataList.add(data);
 		}
-		
 		return dataList;
 	}
 	@RequestMapping("/ntcPzReport")