From 41024e872c57cbfa64c0ea029ea1c49954774afa Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei@intranet.com>
Date: Fri, 22 Jun 2018 15:33:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=8F=82=E6=95=B0=E7=9A=84us?=
 =?UTF-8?q?erRegion=E6=94=B9=E4=B8=BA=E5=9C=A8MaatCfg=E7=B1=BB=E4=B8=AD?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/service/configuration/FileTransferCfgService.java   | 6 +++---
 .../com/nis/web/service/configuration/MailCfgService.java   | 1 -
 .../nis/web/service/configuration/WebsiteCfgService.java    | 6 +++---
 .../com/nis/web/service/configuration/XmppCfgService.java   | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
index 511601f3e..8bfd4388a 100644
--- a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
@@ -273,7 +273,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 			maatCfg.setGroupNum(groupRelationList.size());
 			maatCfg.setAreaIpRegionList(areaIpRegionList);
 			maatCfg.setIsValid(entity.getIsValid());
-			maatCfg.setUserRegion(entity.getCompileId()+"");
+			
 			configCompileList.add(maatCfg);
 			maatBean.setConfigCompileList(configCompileList);
 			maatBean.setAuditTime(entity.getAuditTime());
@@ -496,10 +496,10 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 			maatCfg.setGroupRelationList(groupRelationList);
 			maatCfg.setGroupNum(groupRelationList.size());
 			//TODO 后期修改
-			maatCfg.setUserRegion(entity.getCompileId()+"");
+			
 			maatCfg.setAreaIpRegionList(areaIpRegionList);
 			maatCfg.setIsValid(entity.getIsValid());
-			maatCfg.setUserRegion(entity.getCompileId()+"");
+			
 			configCompileList.add(maatCfg);
 			maatBean.setConfigCompileList(configCompileList);
 			maatBean.setAuditTime(auditTime);
diff --git a/src/main/java/com/nis/web/service/configuration/MailCfgService.java b/src/main/java/com/nis/web/service/configuration/MailCfgService.java
index da7bcf956..401e6cb71 100644
--- a/src/main/java/com/nis/web/service/configuration/MailCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/MailCfgService.java
@@ -297,7 +297,6 @@ public class MailCfgService extends CrudService<MailCfgDao,CfgIndexInfo> {
 			maatCfg.setGroupNum(groupRelationList.size());
 			maatCfg.setAreaIpRegionList(areaIpRegionList);
 			maatCfg.setIsValid(entity.getIsValid());
-			maatCfg.setUserRegion(entity.getCompileId()+"");
 			configCompileList.add(maatCfg);
 			maatBean.setConfigCompileList(configCompileList);
 			maatBean.setAuditTime(entity.getAuditTime());
diff --git a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java
index 70ae7437e..5d4c1002f 100644
--- a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java
@@ -412,7 +412,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 			maatCfg.setGroupNum(groupRelationList.size());
 			maatCfg.setAreaIpRegionList(areaIpRegionList);
 			maatCfg.setIsValid(entity.getIsValid());
-			maatCfg.setUserRegion(entity.getCompileId()+"");
+			
 			configCompileList.add(maatCfg);
 			maatBean.setConfigCompileList(configCompileList);
 			maatBean.setAuditTime(entity.getAuditTime());
@@ -628,7 +628,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 			maatCfg.setGroupNum(groupRelationList.size());
 			maatCfg.setAreaIpRegionList(areaIpRegionList);
 			maatCfg.setIsValid(entity.getIsValid());
-			maatCfg.setUserRegion(entity.getCompileId()+"");
+			
 			configCompileList.add(maatCfg);
 			maatBean.setConfigCompileList(configCompileList);
 			maatBean.setAuditTime(entity.getAuditTime());
@@ -867,7 +867,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 			maatCfg.setGroupNum(groupRelationList.size());
 			maatCfg.setAreaIpRegionList(areaIpRegionList);
 			maatCfg.setIsValid(entity.getIsValid());
-			maatCfg.setUserRegion(entity.getCompileId()+"");
+			
 			configCompileList.add(maatCfg);
 			maatBean.setConfigCompileList(configCompileList);
 			maatBean.setAuditTime(entity.getAuditTime());
diff --git a/src/main/java/com/nis/web/service/configuration/XmppCfgService.java b/src/main/java/com/nis/web/service/configuration/XmppCfgService.java
index 6ae84e56d..fc00d909a 100644
--- a/src/main/java/com/nis/web/service/configuration/XmppCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/XmppCfgService.java
@@ -224,7 +224,7 @@ public class XmppCfgService extends CrudService<XmppCfgDao,CfgIndexInfo> {
 			maatCfg.setGroupNum(groupRelationList.size());
 			maatCfg.setAreaIpRegionList(areaIpRegionList);
 			maatCfg.setIsValid(entity.getIsValid());
-			maatCfg.setUserRegion(entity.getCompileId()+"");
+			
 			configCompileList.add(maatCfg);
 			maatBean.setConfigCompileList(configCompileList);
 			maatBean.setAuditTime(entity.getAuditTime());