From 399396815fdad6726534731bbf1248a5423c7414 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@zdjizhi.com>
Date: Fri, 21 Jun 2019 10:35:55 +0800
Subject: [PATCH] =?UTF-8?q?form=E8=A1=A8=E5=8D=95=E6=B3=A8=E9=87=8AHTTPS?=
 =?UTF-8?q?=E8=B7=9FIntercept,=E6=81=A2=E5=A4=8D=E4=B9=8B=E5=89=8D?=
 =?UTF-8?q?=E8=A2=AB=E6=B3=A8=E9=87=8A=E7=9A=84=E5=8F=96=E6=B6=88=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/web/service/BaseService.java  | 4 ++--
 src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java
index d0da93fa9..8ef57688c 100644
--- a/src/main/java/com/nis/web/service/BaseService.java
+++ b/src/main/java/com/nis/web/service/BaseService.java
@@ -3537,12 +3537,12 @@ public abstract class BaseService {
 						maatBean.setVersion(Constants.MAAT_VERSION);
 						maatBean.setOpAction(Constants.UPDATE_ACTION);
 					}
-				}/*else if(cfgIndexInfo.getIsValid().equals(Constants.VALID_NO)&&cfgIndexInfo.getIsAudit().equals(Constants.AUDIT_NOT_YES)){//生效的配置 置为了失效
+				}else if(userRgionMap.isEmpty()&&cfgIndexInfo.getIsValid().equals(Constants.VALID_NO)&&cfgIndexInfo.getIsAudit().equals(Constants.AUDIT_NOT_YES)){//生效的配置,组清空了，在方法已经将属性只为无效，生成取消配置maat
 					maatCfg.setCompileId(cfgIndexInfo.getCompileId());
 					maatCfg.setServiceId(cfgIndexInfo.getServiceId());
 					maatCfg.setIsValid(0);//无效
 					cancelConfigCompileList.add(maatCfg);
-				}*/
+				}
 				if(cancelConfigCompileList.size()>0&&CollectionUtils.isEmpty(cancelMaatBean.getConfigCompileList())){
 					cancelMaatBean.setConfigCompileList(cancelConfigCompileList);
 					cancelMaatBean.setAuditTime(cfgIndexInfo.getAuditTime());
diff --git a/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp b/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp
index 4b7f38348..e98e939cb 100644
--- a/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp
@@ -340,8 +340,8 @@ var delContent = function(contentClassName, addBtnClassName) {
                                           <label class="control-label col-md-3"><font color="red">*</font><spring:message code="protocol"/></label>
                                           <div class="col-md-6">
                                               <select name="userRegion1" data-live-search="true" class="selectpicker form-control">
-                                                  <option value="https" <c:if test="${_cfg.userRegion1 eq 'https'}">selected</c:if>><spring:message code="HTTPS"/></option>
-                                                  <option value="intercept" <c:if test="${_cfg.userRegion1 eq 'intercept'}">selected</c:if>> <spring:message code="intercept"/></option>
+                                                  <%--<option value="https" <c:if test="${_cfg.userRegion1 eq 'https'}">selected</c:if>><spring:message code="HTTPS"/></option>
+                                                  <option value="intercept" <c:if test="${_cfg.userRegion1 eq 'intercept'}">selected</c:if>> <spring:message code="intercept"/></option>--%>
                                                   <option value="http" <c:if test="${_cfg.userRegion1 eq 'http'}">selected</c:if>> <spring:message code="HTTP"/></option>
                                               </select>
                                           </div>