diff --git a/src/main/java/com/nis/domain/maat/MaatCfg.java b/src/main/java/com/nis/domain/maat/MaatCfg.java
index f1347172f..9321277ff 100644
--- a/src/main/java/com/nis/domain/maat/MaatCfg.java
+++ b/src/main/java/com/nis/domain/maat/MaatCfg.java
@@ -73,6 +73,9 @@ public class MaatCfg implements Serializable {
@Expose
private Integer fatherCfgId;
@Expose
+ @SerializedName("affairId")
+ private Integer requestId;
+ @Expose
@SerializedName("opTime")
private Date auditTime;
@Expose
@@ -652,6 +655,13 @@ public class MaatCfg implements Serializable {
public void setIsValid(Integer isValid) {
this.isValid = isValid;
}
+
+ public Integer getRequestId() {
+ return requestId;
+ }
+ public void setRequestId(Integer requestId) {
+ this.requestId = requestId;
+ }
public void initDefaultValue() {
this.doLog=2;
this.doBlackList=1;
diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java
index 3bdc0473f..c0a03a292 100644
--- a/src/main/java/com/nis/web/controller/BaseController.java
+++ b/src/main/java/com/nis/web/controller/BaseController.java
@@ -818,13 +818,22 @@ public class BaseController {
// requestId check start
Integer requestId=value.getRequestId();
if(requestId==null){
- errInfo.append(String.format(prop.getProperty("can_not_null"), prop.getProperty("letter"))+";");
+ if("whitelistip".equals(specialItem)) {
+ value.setRequestId(0);
+ }else {
+ errInfo.append(String.format(prop.getProperty("can_not_null"), prop.getProperty("letter"))+";");
+ }
+
}else{//查询数据库是否存在ID
- RequestInfo info=requestInfoService.getRequestInfoById((long)requestId.intValue());
- if(info==null){
- errInfo.append(String.format(prop.getProperty("id_not_exists"),requestId, prop.getProperty("letter"))+";");
- }else if(info.getIsValid()==Constants.VALID_NO||info.getIsValid()==Constants.VALID_DEL){
- errInfo.append(String.format(prop.getProperty("id_not_valid"),requestId, prop.getProperty("letter"))+";");
+ if("whitelistip".equals(specialItem)) {
+ value.setRequestId(0);
+ }else {
+ RequestInfo info=requestInfoService.getRequestInfoById((long)requestId.intValue());
+ if(info==null){
+ errInfo.append(String.format(prop.getProperty("id_not_exists"),requestId, prop.getProperty("letter"))+";");
+ }else if(info.getIsValid()==Constants.VALID_NO||info.getIsValid()==Constants.VALID_DEL){
+ errInfo.append(String.format(prop.getProperty("id_not_valid"),requestId, prop.getProperty("letter"))+";");
+ }
}
}
// requestId check end
diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp
index 2c9ea71f2..fc75ac9f9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp
@@ -2,7 +2,7 @@
<%@ include file="/WEB-INF/include/taglib.jsp"%>
-<spring:message code="${cfgName}"></spring:message>
+<spring:message code="basic_protocol"></spring:message>