From bb510e573d54688922647fb576e31c478a4be927 Mon Sep 17 00:00:00 2001
From: "yunhao.wang" <yunhao.wang@estsh.com>
Date: Sat, 13 Apr 2019 18:20:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=B8=83=E5=B1=80-=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E8=A1=8C=E5=88=97=E6=A0=A1=E9=AA=8C=20=E5=BF=85?=
 =?UTF-8?q?=E9=A1=BB=E4=BF=9D=E7=95=991=E8=A1=8C1=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java     | 4 ++--
 .../src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java  | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java
index 8903aea..2441c0d 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java
@@ -49,9 +49,9 @@ public class BfLayout extends BaseBean {
     @ApiParam(value = "列数")
     private Integer layoutColumnCount;
 
-    public Integer getLayoutColumnCount(){
+    public Integer getLayoutColumnCountValue(){
         if(this.layoutColumnCount == null) {
-            return null;
+            return 0;
         }
         return layoutColumnCount.intValue();
     }
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java
index 3996e81..df72dd0 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java
@@ -52,6 +52,13 @@ public class BfLayoutRow extends BaseBean {
     @ApiParam(value = "行所关联列数")
     private Integer rowColNum;
 
+    public int getRowColNumValue(){
+        if(rowColNum == null){
+            return 0;
+        }
+        return rowColNum.intValue();
+    }
+
     // 行所包含的列
     @Transient
     private List<BfLayoutColumn> bfLayoutColumns;