From fe2c7df204ceb51a5dd62cc00bf84d626d2de8e7 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Wed, 25 Jul 2018 12:41:54 +0800
Subject: [PATCH] =?UTF-8?q?(1)app=E7=AD=96=E7=95=A5=E4=BF=AE=E6=94=B9dao.x?=
 =?UTF-8?q?ml=EF=BC=8Cupdate=E6=93=8D=E4=BD=9C=E9=99=A4=E4=BA=86creatorId?=
 =?UTF-8?q?=EF=BC=8CcreatorTime,editorId,editTime,auditor,aduitTime?=
 =?UTF-8?q?=E4=B9=8B=E5=A4=96=EF=BC=8C=E5=8E=BB=E6=8E=89if=20null=E7=9A=84?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=20(2)app=E7=AD=96=E7=95=A5=EF=BC=8C=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E5=8D=8F=E8=AE=AE=E9=A1=B5=E9=9D=A2ratelimit=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=8F=90=E4=BA=A4=E8=A1=A8=E5=8D=95=E6=97=B6=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9Catction=E4=B8=8D=E4=B8=BA=E9=99=90=E9=80=9F=EF=BC=8C?=
 =?UTF-8?q?=E7=BD=AE=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/web/dao/configuration/AppCfgDao.xml   | 106 +++++++++---------
 .../views/cfg/app/appPolicyCfgForm.jsp        |   5 +
 .../WEB-INF/views/cfg/basicprotocol/form.jsp  |   3 +
 3 files changed, 61 insertions(+), 53 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
index a2ace008d..3ffaeea66 100644
--- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
@@ -1180,96 +1180,96 @@
     update app_policy_cfg
     <set >
       <trim suffixOverrides=",">
-      <if test="cfgDesc != null and cfgDesc != ''" >
+      <!-- <if test="cfgDesc != null and cfgDesc != ''" > -->
         cfg_desc = #{cfgDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="appCode != null">
+     <!--  </if>
+      <if test="appCode != null"> -->
     	APP_CODE = #{appCode,jdbcType=INTEGER},
-      </if>
-      <if test="behavCode != null">
+      <!-- </if>
+      <if test="behavCode != null"> -->
     	BEHAV_CODE = #{behavCode,jdbcType=INTEGER},
-      </if>
-      <if test="specServiceId != null">
+      <!-- </if>
+      <if test="specServiceId != null"> -->
     	SPEC_SERVICE_ID = #{specServiceId,jdbcType=INTEGER},
-      </if>
-      <if test="action != null" >
+     <!--  </if>
+      <if test="action != null" > -->
         action = #{action,jdbcType=INTEGER},
-      </if>
-      <if test="isValid != null" >
+     <!--  </if>
+      <if test="isValid != null" > -->
         is_valid = #{isValid,jdbcType=INTEGER},
-      </if>
-      <if test="isAudit != null" >
+      <!-- </if>
+      <if test="isAudit != null" > -->
         is_audit = #{isAudit,jdbcType=INTEGER},
-      </if>
+     <!--  </if> -->
       <if test="creatorId != null" >
         creator_id = #{creatorId,jdbcType=INTEGER},
-      </if>
+     </if>
       <if test="createTime != null and createTime != ''" >
         create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
+     </if>
       <if test="editorId != null" >
         editor_id = #{editorId,jdbcType=INTEGER},
       </if>
       <if test="editTime != null and editTime != ''" >
         edit_time = #{editTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="auditorId != null" >
+      <if test="auditorId != null" > -->
         auditor_id = #{auditorId,jdbcType=INTEGER},
-      </if>
-      <if test="auditTime != null and auditTime != ''" >
+     </if>
+      <if test="auditTime != null and auditTime != ''" > 
         audit_time = #{auditTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="serviceId != null" >
+     <!-- <if test="serviceId != null" > -->
         service_id = #{serviceId,jdbcType=INTEGER},
-      </if>
-      <if test="requestId != null" >
+      <!-- </if>
+      <if test="requestId != null" > -->
         request_id = #{requestId,jdbcType=INTEGER},
-      </if>
-      <if test="compileId != null" >
+      <!-- </if>
+      <if test="compileId != null" > -->
         compile_id = #{compileId,jdbcType=INTEGER},
-      </if>
-      <if test="isAreaEffective != null" >
+      <!-- </if>
+      <if test="isAreaEffective != null" > -->
         is_area_effective = #{isAreaEffective,jdbcType=INTEGER},
-      </if>
-      <if test="classify != null and classify != ''" >
+      <!-- </if>
+      <if test="classify != null and classify != ''" > -->
         classify = #{classify,jdbcType=VARCHAR},
-      </if>
-      <if test="attribute != null and attribute != ''" >
+     <!--  </if>
+      <if test="attribute != null and attribute != ''" > -->
         attribute = #{attribute,jdbcType=VARCHAR},
-      </if>
-      <if test="lable != null and lable != ''" >
+     <!--  </if>
+      <if test="lable != null and lable != ''" > -->
         lable = #{lable,jdbcType=VARCHAR},
-      </if>
-      <if test="areaEffectiveIds != null" >
+     <!--  </if>
+      <if test="areaEffectiveIds != null" > -->
         area_effective_ids =  #{areaEffectiveIds,jdbcType=VARCHAR},
-      </if>
-      <if test="functionId != null" >
+      <!-- </if>
+      <if test="functionId != null" > -->
         function_id =  #{functionId,jdbcType=INTEGER},
-      </if>
-      <if test="ratelimit != null">
+     <!--  </if>
+      <if test="ratelimit != null"> -->
 		RATELIMIT=#{ratelimit,jdbcType=INTEGER},
-      </if>
-      <if test="cfgRegionCode != null">
+     <!--  </if>
+      <if test="cfgRegionCode != null"> -->
    		CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER},
-   	  </if>
-   	  <if test="cfgType != null and cfgType != ''">
+   	  <!-- </if>
+   	  <if test="cfgType != null and cfgType != ''"> -->
    		CFG_TYPE =#{cfgType,jdbcType=VARCHAR},
-      </if>
-   	  <if test="userRegion1 != null and userRegion1 != ''">
+      <!-- </if>
+   	  <if test="userRegion1 != null and userRegion1 != ''"> -->
    		USER_REGION1 =#{userRegion1,jdbcType=VARCHAR},
-      </if>
-   	  <if test="userRegion2 != null and userRegion2 != ''">
+     <!--  </if>
+   	  <if test="userRegion2 != null and userRegion2 != ''"> -->
    		USER_REGION2 =#{userRegion2,jdbcType=VARCHAR},
-      </if>
-   	  <if test="userRegion3 != null and userRegion3 != ''">
+      <!-- </if>
+   	  <if test="userRegion3 != null and userRegion3 != ''"> -->
    		USER_REGION1 =#{userRegion3,jdbcType=VARCHAR},
-      </if>
-   	  <if test="userRegion4 != null and userRegion4 != ''">
+     <!--  </if>
+   	  <if test="userRegion4 != null and userRegion4 != ''"> -->
    		USER_REGION1 =#{userRegion4,jdbcType=VARCHAR},
-      </if>
-   	  <if test="userRegion5 != null and userRegion5 != ''">
+      <!-- </if>
+   	  <if test="userRegion5 != null and userRegion5 != ''"> -->
    		USER_REGION1 =#{userRegion5,jdbcType=VARCHAR},
-      </if>
+      <!-- </if> -->
       </trim>
     </set>
     where cfg_id = #{cfgId,jdbcType=BIGINT}
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
index 3c94b1b52..508dfad05 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
@@ -53,6 +53,9 @@ $(function(){
 				if($("[name='behavCode']")&&$("[name='behavCode']").val()!=""){
 					$("input[name$='exprType']").val(1);
 				}
+				if($("input[name='ratelimit']").is(":hidden")){
+					$("input[name='ratelimit']").val("");
+				}
 				/* $("#appCode").val($("#specServiceIdId").val()); */
 				loading('onloading...');
 				form.submit();
@@ -190,12 +193,14 @@ var delContent = function(contentClassName, addBtnClassName) {
 										        </div>
 										    </div>
 										    <div class="col-md-6">
+										    	<div class="form-group">
 										    	 	<label class="control-label col-md-3"><spring:message code="behaviour_type"/></label>
 										    	 	 <div class="col-md-6" id="behaviour">
 										    	 	 <select name="behavCode" data-live-search="true" class="selectpicker form-control">
 										    	 	 <option value=""><spring:message code="select"/></option>
 										    	 	 </select>
 										    	 	 </div>
+										    	</div>
 										    </div>
 									</div>
 									<div class="row">
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 fd73af01d..2c9ea71f2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp
@@ -53,6 +53,9 @@ $(function(){
 				if($("[name='behavCode']")&&$("[name='behavCode']").val()!=""){
 					$("input[name$='exprType']").val(1);
 				}
+				if($("input[name='ratelimit']").is(":hidden")){
+					$("input[name='ratelimit']").val("");
+				}
 				/* $("#appCode").val($("#specServiceIdId").val()); */
 				loading('onloading...');
 				form.submit();