From fea32ae4927bf14ee279e6f95acb1b9c67f01998 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Mon, 25 Jul 2016 17:51:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeecgframework/core/common/dao/impl/CommonDao.java |  4 +++-
 .../cgform/controller/trans/CgformTransController.java | 10 ++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/jeecgframework/core/common/dao/impl/CommonDao.java b/src/main/java/org/jeecgframework/core/common/dao/impl/CommonDao.java
index 05d4fc3d..1c16b8ca 100644
--- a/src/main/java/org/jeecgframework/core/common/dao/impl/CommonDao.java
+++ b/src/main/java/org/jeecgframework/core/common/dao/impl/CommonDao.java
@@ -553,7 +553,9 @@ public class CommonDao extends GenericBaseCommonDao implements ICommonDao, IGene
             }
         }
 
-		curChildList.clear();
+		if(curChildList!=null){
+			curChildList.clear();
+		}
 
 		return tree;
 	}
diff --git a/src/main/java/org/jeecgframework/web/cgform/controller/trans/CgformTransController.java b/src/main/java/org/jeecgframework/web/cgform/controller/trans/CgformTransController.java
index 0b343233..d79623e9 100644
--- a/src/main/java/org/jeecgframework/web/cgform/controller/trans/CgformTransController.java
+++ b/src/main/java/org/jeecgframework/web/cgform/controller/trans/CgformTransController.java
@@ -22,6 +22,7 @@ import org.jeecgframework.codegenerate.pojo.Columnt;
 import org.jeecgframework.core.common.model.json.AjaxJson;
 import org.jeecgframework.core.common.model.json.DataGrid;
 import org.jeecgframework.core.util.StringUtil;
+import org.jeecgframework.core.util.oConvertUtils;
 import org.jeecgframework.tag.vo.datatable.SortDirection;
 import org.jeecgframework.web.cgform.entity.config.CgFormFieldEntity;
 import org.jeecgframework.web.cgform.entity.config.CgFormHeadEntity;
@@ -197,13 +198,13 @@ public class CgformTransController {
 							cgFormField.setLength(Integer.valueOf(columnt
 									.getPrecision()));
 						}
-
+						//update-begin--Author:zhangdaihao  Date:20140212 for：[001]oracle下number类型，数据库表导出表单，默认长度为0同步失败
 						else{
 							if(cgFormField.getType().equals(DataBaseConst.INT)){
 								cgFormField.setLength(10);
 							}
 						}
-
+						//update-end--Author:zhangdaihao  Date:20140212 for：[001]oracle下number类型，数据库表导出表单，默认长度为0同步失败
 						if (StringUtil.isNotEmpty(columnt.getScale()))
 							cgFormField.setPointLength(Integer.valueOf(columnt
 									.getScale()));
@@ -212,6 +213,11 @@ public class CgformTransController {
 					columnsList.add(cgFormField);
 				}
 				cgFormHead.setColumns(columnsList);
+				//update-begin--Author:scott  Date:20170720  for：导入报单报错-----
+				if(oConvertUtils.isEmpty(cgFormHead.getJformCategory())){
+					cgFormHead.setJformCategory("bdfl_ptbd");
+				}
+				//update-end--Author:scott  Date:20170720  for：导入报单报错-----
 				cgFormFieldService.saveTable(cgFormHead, "");
 				if (yes != "")
 					yes += ",";