Merge branch 'fix/organization_import' into 'develop'

修复导入人员组织时对组织级别的必填判断

See merge request o2oa/o2oa!1286

o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/inputperson/ActionInputAll.java

@@ -245,10 +245,10 @@ class ActionInputAll extends BaseAction {
 					if (null != configurator.getUnitTypeColumn()) {
 						String typeList = configurator.getCellStringValue(row.getCell(configurator.getUnitTypeColumn()));
 						typeList = StringUtils.trimToEmpty(typeList);
-						/*typeList = typeMap.get(typeList);
-						System.out.println("typeListx="+typeList);*/
 						List<String> typeListStr = new ArrayList<>();
-						typeListStr.add(typeList);
+						if(StringUtils.isNotEmpty(typeList)){
+							typeListStr.add(typeList);
+						}
 						unitItem.setTypeList(typeListStr);
 					}
 					if (null != configurator.getSuperiorColumn()) {