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 bfLayoutColumns;