From 1b3bda55975f990d08aa35c53dc0063ab6df2cf0 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@nismail.iie.ac.cn>
Date: Tue, 30 Oct 2018 16:53:36 +0800
Subject: [PATCH] =?UTF-8?q?DNS=20=E5=85=B3=E9=94=AE=E5=AD=97=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=8A=A0=E5=85=A5=E5=88=A4=E6=96=AD=EF=BC=8Caction=20?=
 =?UTF-8?q?reject=E6=89=8D=E8=B0=83=E7=94=A8DnsComplexStringTemplate?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/web/controller/BaseController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java
index ba8cba9ce..ac50167e5 100644
--- a/src/main/java/com/nis/web/controller/BaseController.java
+++ b/src/main/java/com/nis/web/controller/BaseController.java
@@ -3172,7 +3172,7 @@ public class BaseController {
 						}
 
 					} else if (regionDict.getRegionType().equals(3)) {// 增强字符串类
-						if (regionDict.getFunctionId().equals(7)) {
+						if (regionDict.getFunctionId().equals(7)&&serviceDict!=null&&serviceDict.getAction().intValue()==16) {
 							List<DnsComplexStringTemplate> list = ei.getDataList(DnsComplexStringTemplate.class,
 									this.getMsgProp());
 							complexkeywordCfgs = this.checkComplexStringCfg(serviceDict, regionDict, list);