github
/
jeecg
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

组织机构选择角色

pull/6/merge
zhangdaiscott 2016-07-25 17:51:41 +08:00
parent 915d71b993
commit fea32ae492
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/jeecgframework/core/common/dao/impl/CommonDao.java
View File

@ -553,7 +553,9 @@ public class CommonDao extends GenericBaseCommonDao implements ICommonDao, IGene
} }
} }
curChildList.clear(); if(curChildList!=null){
curChildList.clear();
}
return tree; return tree;
} }

10
src/main/java/org/jeecgframework/web/cgform/controller/trans/CgformTransController.java
View File

@ -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.AjaxJson;
import org.jeecgframework.core.common.model.json.DataGrid; import org.jeecgframework.core.common.model.json.DataGrid;
import org.jeecgframework.core.util.StringUtil; import org.jeecgframework.core.util.StringUtil;
import org.jeecgframework.core.util.oConvertUtils;
import org.jeecgframework.tag.vo.datatable.SortDirection; import org.jeecgframework.tag.vo.datatable.SortDirection;
import org.jeecgframework.web.cgform.entity.config.CgFormFieldEntity; import org.jeecgframework.web.cgform.entity.config.CgFormFieldEntity;
import org.jeecgframework.web.cgform.entity.config.CgFormHeadEntity; import org.jeecgframework.web.cgform.entity.config.CgFormHeadEntity;
@ -197,13 +198,13 @@ public class CgformTransController {
cgFormField.setLength(Integer.valueOf(columnt cgFormField.setLength(Integer.valueOf(columnt
.getPrecision())); .getPrecision()));
} }
//update-begin--Author:zhangdaihao Date:20140212 for：[001]oracle下number类型，数据库表导出表单，默认长度为0同步失败
else{ else{
if(cgFormField.getType().equals(DataBaseConst.INT)){ if(cgFormField.getType().equals(DataBaseConst.INT)){
cgFormField.setLength(10); cgFormField.setLength(10);
} }
} }
//update-end--Author:zhangdaihao Date:20140212 for：[001]oracle下number类型，数据库表导出表单，默认长度为0同步失败
if (StringUtil.isNotEmpty(columnt.getScale())) if (StringUtil.isNotEmpty(columnt.getScale()))
cgFormField.setPointLength(Integer.valueOf(columnt cgFormField.setPointLength(Integer.valueOf(columnt
.getScale())); .getScale()));
@ -212,6 +213,11 @@ public class CgformTransController {
columnsList.add(cgFormField); columnsList.add(cgFormField);
} }
cgFormHead.setColumns(columnsList); 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, ""); cgFormFieldService.saveTable(cgFormHead, "");
if (yes != "") if (yes != "")
yes += ","; yes += ",";