Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
===================================================================
diff -u -r14848 -r14851
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 14848)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 14851)
@@ -81,6 +81,7 @@
 import com.forgon.tools.excel.ParerUtils;
 import com.forgon.tools.hibernate.ObjectDao;
 import com.forgon.tools.string.StringTools;
+import com.forgon.treenode.model.THTreeNode;
 import com.forgon.treenode.service.THTreeNodeManager;
 
 /**
@@ -1531,6 +1532,12 @@
 						barcode.setType(BarcodeDevice.BARCODE_TYPE_ORGUNIT);
 						orgUnit.setBarcodeDevice(barcode);
 					}
+					OrgUnit rootOrgUnit = (OrgUnit) thTreeNodeManager.getTHTreeNodeById(OrgUnit.class
+							.getSimpleName(), THTreeNode.THTreeNodeRootId);
+					if (rootOrgUnit != null) {
+						orgUnit.setParent(rootOrgUnit);
+						orgUnit.setParentId(rootOrgUnit.getId());
+					}
 					orgUnitManager.saveOrUpdata(orgUnit);
 					thTreeNodeManager.updateTHTreeNode(orgUnit);
 					successCount++;
@@ -1575,6 +1582,12 @@
 					barcode.setType(BarcodeDevice.BARCODE_TYPE_ORGUNIT);
 					orgUnit.setBarcodeDevice(barcode);
 				}
+				OrgUnit rootOrgUnit = (OrgUnit) thTreeNodeManager.getTHTreeNodeById(OrgUnit.class
+						.getSimpleName(), THTreeNode.THTreeNodeRootId);
+				if (rootOrgUnit != null) {
+					orgUnit.setParent(rootOrgUnit);
+					orgUnit.setParentId(rootOrgUnit.getId());
+				}
 				orgUnitManager.saveOrUpdata(orgUnit);
 				thTreeNodeManager.updateTHTreeNode(orgUnit);
 				successCount++;
Index: forgon-core/src/main/java/com/forgon/security/model/User.java
===================================================================
diff -u -r14740 -r14851
--- forgon-core/src/main/java/com/forgon/security/model/User.java	(.../User.java)	(revision 14740)
+++ forgon-core/src/main/java/com/forgon/security/model/User.java	(.../User.java)	(revision 14851)
@@ -61,6 +61,7 @@
 		ColumnNameAndPoPropertyNameMap.put("电子邮件", "email");
 		ColumnNameAndPoPropertyNameMap.put("角色", "roleNames");
 		ColumnNameAndPoPropertyNameMap.put("备注", "descn");
+		ColumnNameAndPoPropertyNameMap.put("所属部门编码", "currentOrgUnitCode");
 	}
 
 	private String objectGUID;
Index: forgon-tools/src/main/java/com/forgon/tools/Constants.java
===================================================================
diff -u -r14284 -r14851
--- forgon-tools/src/main/java/com/forgon/tools/Constants.java	(.../Constants.java)	(revision 14284)
+++ forgon-tools/src/main/java/com/forgon/tools/Constants.java	(.../Constants.java)	(revision 14851)
@@ -95,6 +95,7 @@
 	
 	public static final String SOURCE_MANUAL = "手工";
 	public static final String SOURCE_SYNC = "同步";
+	public static final String SOURCE_IMPORT = "导入";
 	
 	
 }
Index: ssts-web/src/main/java/com/forgon/disinfectsystem/directory/service/SysUserManagerImpl.java
===================================================================
diff -u -r12335 -r14851
--- ssts-web/src/main/java/com/forgon/disinfectsystem/directory/service/SysUserManagerImpl.java	(.../SysUserManagerImpl.java)	(revision 12335)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/directory/service/SysUserManagerImpl.java	(.../SysUserManagerImpl.java)	(revision 14851)
@@ -770,6 +770,13 @@
 				User user = (User) obj;
 				
 				String orgUnitNames = user.getOrgUnitNames();
+				String orgUnitCode = user.getCurrentOrgUnitCode();
+				if(StringUtils.isBlank(orgUnitNames) && StringUtils.isNotBlank(orgUnitCode)){
+					OrgUnit ou = orgUnitManager.getByCode(orgUnitCode);
+					if(ou != null){
+						orgUnitNames = ou.getName();
+					}
+				}
 				if (StringUtils.isNotBlank(orgUnitNames)){
 					orgUnitNames = orgUnitNames.replace("组织机构－", "");
 					user.setOrgUnitNames(orgUnitNames);
@@ -794,6 +801,7 @@
 			} else {
 				copyImportProperties(user, existedUserPO);
 			}
+			user.setSource(Constants.SOURCE_IMPORT);
 			setOrgAndRoles(existedUserPO);
 			saveUser(existedUserPO);
 		}