From 5b810725b52b18a89534a1d07b0da6210971e2b0 Mon Sep 17 00:00:00 2001
From: chenlw <874313221@qq.com>
Date: Thu, 3 Nov 2016 16:03:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=8C=E6=94=BF=E5=8C=BA?=
 =?UTF-8?q?=E5=88=92=E6=97=B6=EF=BC=8C=E7=B3=BB=E7=BB=9F=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=97=B6=EF=BC=8C=E4=B8=8D=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/platform/service/impl/PreDataInfoServiceImpl.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/com/platform/service/impl/PreDataInfoServiceImpl.java b/src/com/platform/service/impl/PreDataInfoServiceImpl.java
index 79f04f96..55e72d47 100644
--- a/src/com/platform/service/impl/PreDataInfoServiceImpl.java
+++ b/src/com/platform/service/impl/PreDataInfoServiceImpl.java
@@ -194,7 +194,7 @@ public class PreDataInfoServiceImpl implements IPreDataInfoService {
 		if (list4AddArea.size() > 0) {
 			this.addArea(list4AddArea);
 		}
-		//在 pre_data_info表中 新增 操作为（新增行政区划）的系统
+		//在 pre_data_info表中 新增 操作为（新增行政区划）的系统 -- start
 		List<PreDataInfo> allAreaInsert = new ArrayList<PreDataInfo>();
 		List<String> sysNamesArea = new ArrayList<String>();
 		for (PreDataInfo preDataInfo : list4AddArea) {
@@ -222,7 +222,7 @@ public class PreDataInfoServiceImpl implements IPreDataInfoService {
 		if (allAreaInsert.size() > 0) {
 			preDataInfoDao.insertBatch(allAreaInsert);
 		}
-		
+		//在 pre_data_info表中 新增 操作为（新增行政区划）的系统 -- end
 		//在 pre_data_info表中 更新 操作为 (修改) 的系统
 		if (list4Update.size() > 0) {
 			List<PreDataInfo> allUpdate = new ArrayList<PreDataInfo>();
@@ -461,6 +461,9 @@ public class PreDataInfoServiceImpl implements IPreDataInfoService {
 		}
 		//本次新增的系统
 		for (PreDataInfo pre : allAreaInsert) {
+			if (null == pre.getSysName() || "".equals(pre.getSysName())) {
+				continue;
+			}
 			excelAdd.put(pre.getAreaCode()+"_"+pre.getSysName().trim(), pre);
 		}
 		for (String key : excelAdd.keySet()) {