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 dnsGroupInfos = policyGroupInfoService.findPolicyGroupInfosByTypeforUD(cfg.getGroupType(), cfg.getUdFlag()); - model.addAttribute("policyGroupInfos", dnsGroupInfos); + List 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 serviceList = DictUtils.getFunctionServiceDictList(cfg.getFunctionId()); model.addAttribute("serviceList", serviceList); - List dnsGroupInfos = policyGroupInfoService.findPolicyGroupInfosByTypeforUD(cfg.getGroupType(), cfg.getUdFlag()); - model.addAttribute("policyGroupInfos", dnsGroupInfos); + List policyGroupInfos = policyGroupInfoService.findPolicyGroupInfosByTypeforUD(cfg.getGroupType(), cfg.getUdFlag()); + model.addAttribute("policyGroupInfos", policyGroupInfos); } public List getAreaIsps(String areaEffectiveIds, List areaIspList, List 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} - and udFlag=#{flag} + and ud_flag=#{flag} \ 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 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