From 10394d3fd6e9a13f8eb406c58310654f33bf5299 Mon Sep 17 00:00:00 2001
From: tanghao <default@DESKTOP-7FEGRP2>
Date: Fri, 15 Feb 2019 18:03:36 +0800
Subject: [PATCH] =?UTF-8?q?1.policy=5Fgroup=5Finfo=E8=A1=A8sql=202.?=
 =?UTF-8?q?=E8=A1=A8=E5=90=8D=E4=BF=AE=E6=94=B9=E5=91=BD=E5=90=8D=E8=A7=84?=
 =?UTF-8?q?=E8=8C=83=203.serviceGroupId=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/web/controller/BaseController.java | 8 ++++----
 .../java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml   | 2 +-
 .../nis/web/service/basics/PolicyGroupInfoService.java   | 9 +++++++++
 .../resources/sql/20190215/alter_policy_group_info.sql   | 2 ++
 4 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 src/main/resources/sql/20190215/alter_policy_group_info.sql

diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java
index 7ba6d945f..ad944f82e 100644
--- a/src/main/java/com/nis/web/controller/BaseController.java
+++ b/src/main/java/com/nis/web/controller/BaseController.java
@@ -640,8 +640,8 @@ public class BaseController {
 				}
 			}
 		}
-		List<PolicyGroupInfo> dnsGroupInfos = policyGroupInfoService.findPolicyGroupInfosByTypeforUD(cfg.getGroupType(),  cfg.getUdFlag());
-		model.addAttribute("policyGroupInfos", dnsGroupInfos);
+		List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoService.findPolicyGroupInfosByTypeforUD(cfg.getGroupType(),  cfg.getUdFlag());
+		model.addAttribute("policyGroupInfos", policyGroupInfos);
 	}
 
 	protected void initUpdateFormCondition(Model model, BaseCfg cfg) {
@@ -706,8 +706,8 @@ public class BaseController {
 		model.addAttribute("regionList", regionList);
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(cfg.getFunctionId());
 		model.addAttribute("serviceList", serviceList);
-		List<PolicyGroupInfo> dnsGroupInfos = policyGroupInfoService.findPolicyGroupInfosByTypeforUD(cfg.getGroupType(), cfg.getUdFlag());
-		model.addAttribute("policyGroupInfos", dnsGroupInfos);
+		List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoService.findPolicyGroupInfosByTypeforUD(cfg.getGroupType(), cfg.getUdFlag());
+		model.addAttribute("policyGroupInfos", policyGroupInfos);
 	}
 
 	public List<AreaBean> getAreaIsps(String areaEffectiveIds, List<AreaBean> areaIspList, List<SysDictInfo> isps,
diff --git a/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml b/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml
index 2879438d1..dc4c52815 100644
--- a/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml
@@ -273,7 +273,7 @@
 	    FROM policy_group_info r
 	    where r.is_valid=1 and r.group_type=#{groupType,jdbcType=INTEGER}
 	    <if test="flag!=null">
-	    and	udFlag=#{flag}
+	    and	ud_flag=#{flag}
 	    </if>
 	</select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/java/com/nis/web/service/basics/PolicyGroupInfoService.java b/src/main/java/com/nis/web/service/basics/PolicyGroupInfoService.java
index 4b9d24fe9..6a3007677 100644
--- a/src/main/java/com/nis/web/service/basics/PolicyGroupInfoService.java
+++ b/src/main/java/com/nis/web/service/basics/PolicyGroupInfoService.java
@@ -108,6 +108,15 @@ public class PolicyGroupInfoService extends BaseService{
 //					}
 					
 				}
+			}else if(11==entity.getGroupType()||12==entity.getGroupType()) {
+				int serviceGroupId=0;
+				List<Integer> groupIds= ConfigServiceUtil.getId(2,1);
+				if(groupIds.size()>0) {
+					serviceGroupId=groupIds.get(0).intValue();
+				}else {
+					throw new MaatConvertException("Get asn group id failed");
+				}
+				entity.setServiceGroupId(serviceGroupId);
 			}
 			policyGroupInfoDao.insert(entity);
 		//淇敼
diff --git a/src/main/resources/sql/20190215/alter_policy_group_info.sql b/src/main/resources/sql/20190215/alter_policy_group_info.sql
new file mode 100644
index 000000000..9e28328eb
--- /dev/null
+++ b/src/main/resources/sql/20190215/alter_policy_group_info.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `policy_group_info`
+ADD COLUMN `ud_flag`  int(2) NOT NULL DEFAULT 0 COMMENT 'udFlag字段用于url组以及dns组相关功能字段 -1删除 1有域配置可选状态 0配置不可选状态；默认0';
\ No newline at end of file