Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java

@@ -255,7 +255,7 @@ public class DdlPreparedPack {
      * @param packBean
      */
     public static void getNumEqualPack(Object data, String columnName, DdlPackBean packBean) {
-        if (data != null) {
+        if (data != null && Long.parseLong(data.toString()) > 0) {
             packBean.addColumnQuery(columnName," and model." + columnName + " = :m_" + columnName, data);
         }
     }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java

@@ -41,6 +41,9 @@ public class BfIntercept extends BaseBean {
 
     @Column(name="EXECUTE_CONTENT")
     @ApiParam(value ="执行内容")
-    @JsonSerialize(using = ToStringSerializer.class)
+    private String executeContent;
-    private Integer executeContent;
+
+    @Column(name="INTERCEPT_DESCRIPTION")
+    @ApiParam(value ="拦截器描述")
+    private String interceptDescription;
 }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java

@@ -48,9 +48,9 @@ public class BfInterceptDetail extends BaseBean {
     @ApiParam(value ="拦截器位置")
     private Integer interceptPosition;
 
-    public Integer getInterceptPosition() {
+    public int getInterceptPositionVal() {
         if(this.interceptPosition == null){
-            return null;
+            return 0;
         } else {
             return this.interceptPosition.intValue();
         }
@@ -69,4 +69,22 @@ public class BfInterceptDetail extends BaseBean {
     @ApiParam(value ="拦截器业务结果处理")
     private Integer interceptProcessResult;
 
+    public int getInterceptProcessResultVal(){
+        if(interceptProcessResult == null ){
+            return 0;
+        }
+        return interceptProcessResult.intValue();
+    }
+
+    @Column(name="INTERCEPT_EXECUTE_SORT")
+    @ApiParam(value ="拦截器业务执行顺序")
+    private Integer interceptExecuteSort;
+
+    public int getInterceptExecuteSortVal(){
+        if(interceptExecuteSort == null ){
+            return 0;
+        }
+        return interceptExecuteSort.intValue();
+    }
+
 }