diff --git a/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml b/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml index a93256c13..c957eb53d 100644 --- a/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml @@ -166,7 +166,6 @@ insert into dns_res_strategy ( - CFG_ID, CFG_DESC, ACTION, IS_VALID, @@ -201,7 +200,6 @@ compile_Id, cfg_region_code )values ( - #{cfgId,jdbcType=VARCHAR}, #{cfgDesc,jdbcType=VARCHAR}, #{action,jdbcType=INTEGER}, 0, diff --git a/src/main/java/com/nis/web/service/configuration/DnsResStrategyService.java b/src/main/java/com/nis/web/service/configuration/DnsResStrategyService.java index d68664a77..9b9967d30 100644 --- a/src/main/java/com/nis/web/service/configuration/DnsResStrategyService.java +++ b/src/main/java/com/nis/web/service/configuration/DnsResStrategyService.java @@ -15,6 +15,7 @@ import com.nis.domain.configuration.DnsResStrategy; import com.nis.domain.maat.ToMaatResult; import com.nis.exceptions.MaatConvertException; import com.nis.util.ConfigServiceUtil; +import com.nis.util.StringUtil; import com.nis.web.dao.configuration.DnsResStrategyDao; import com.nis.web.security.UserUtils; import com.nis.web.service.BaseService; @@ -62,7 +63,10 @@ public class DnsResStrategyService extends BaseService{ public void saveOrUpdate(DnsResStrategy entity){ Date createTime=new Date(); setAreaEffectiveIds(entity); - List list=dnsResStrategyDao.findList(entity.getCfgId(),null,null); + List list = new ArrayList(); + if( entity.getCfgId()!=null && !"".equals(entity.getCfgId())){ + list=dnsResStrategyDao.findList(entity.getCfgId(),null,null); + } //新增 if(list==null || list.size()==0){ entity.initDefaultValue(); diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp index 5eb34e86d..b3bf7c6c4 100644 --- a/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp +++ b/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp @@ -214,12 +214,12 @@ label.errorShow { -
+ <%--
-
+
--%>
diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictInfo.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictInfo.jsp index 9a768d55f..12ebb72ff 100644 --- a/src/main/webapp/WEB-INF/views/basics/serviceDictInfo.jsp +++ b/src/main/webapp/WEB-INF/views/basics/serviceDictInfo.jsp @@ -57,12 +57,12 @@ maxlength="50" class="form-control" readonly="readonly"/>
-
+ <%--
-
+
--%>
diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp index 0b6215941..6635d08cc 100644 --- a/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp @@ -163,12 +163,12 @@
- +
@@ -279,7 +279,7 @@ - + <%-- --%> @@ -296,8 +296,8 @@ <%-- ${serviceDictInfo.showSequence} --%> - ${serviceDictInfo.itemCode} - ${serviceDictInfo.itemValue} + <%-- ${serviceDictInfo.itemCode} --%> + ${serviceDictInfo.itemValue} ${fns:abbr(serviceDictInfo.itemDesc,15)} diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp index 5f6932316..9e632db4e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp @@ -19,9 +19,9 @@ $(function(){ }, submitHandler: function(form){ var flag = true; - var cfgId=$("#cfgId").val(); + //var cfgId=$("#cfgId").val(); var message=""; - if(flag){ + /* if(flag){ if($("#isAdd").val() == 'true'){ $.ajax({ type:'post', @@ -38,15 +38,15 @@ $(function(){ }); } - } - if(flag){ + } */ + /* if(flag){ $("#cfgId").removeClass("error"); $("#cfgId").attr("aria-invalid","false"); }else{ $("div[for=cfgId]").html(""); $("#cfgId").addClass("error"); $("#cfgId").attr("aria-invalid","true"); - } + } */ if(flag){ var maxTtl=$("[name=maxTtl]").val(); maxTtl = parseInt(maxTtl); @@ -93,6 +93,9 @@ $(function(){ + + + @@ -102,7 +105,7 @@ $(function(){
-
+ <%--
@@ -110,7 +113,7 @@ $(function(){
-
+
--%>