Index: forgon-core/src/main/java/com/forgon/directory/action/OrgUnitAction.java
===================================================================
diff -u -r26878 -r26891
--- forgon-core/src/main/java/com/forgon/directory/action/OrgUnitAction.java	(.../OrgUnitAction.java)	(revision 26878)
+++ forgon-core/src/main/java/com/forgon/directory/action/OrgUnitAction.java	(.../OrgUnitAction.java)	(revision 26891)
@@ -108,7 +108,7 @@
 				// 用户管理页面不显示已经停用的科室
 				if (StringUtils.equals(type, "user")) {
 					OrgUnit ou = orgUnitList.get(j);
-					if (ou.getStatus() != null && ou.getStatus() == OrgUnit.STATUS_DISABLED) {
+					if (ou.getStatus() != null && OrgUnit.STATUS_DISABLED.equals(ou.getStatus())) {
 						continue;
 					}
 				}
Index: forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
===================================================================
diff -u -r26878 -r26891
--- forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java	(.../OrgUnitManagerImpl.java)	(revision 26878)
+++ forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java	(.../OrgUnitManagerImpl.java)	(revision 26891)
@@ -94,6 +94,10 @@
 		this.serialNumManager = serialNumManager;
 	}
 
+	public void setAppLogManager(LogManager appLogManager) {
+		this.appLogManager = appLogManager;
+	}
+
 	@Override
 	public String getJsonChildreanCheckNode(long parentId) {
 		List<ExtCheckTreeNode> extTreeNodes = new ArrayList<ExtCheckTreeNode>();
@@ -319,9 +323,9 @@
 	}
 
 	@Override
-	public String getJsonChildrenNode(long parentId, String type) {
+	public String getJsonChildrenNode(Long parentId, String type) {
 		List<THTreeNode> children = null;
-		if (parentId == 0) {
+		if (parentId != null && parentId.longValue() == 0) {
 			String companyId = AcegiHelper.getLoginUser().getCurrentCompanyId();
 			if (StringUtils.isNotBlank(companyId)
 					&& !OrgUnit.THTreeNodeRootId.toString().equals(companyId)) {
@@ -488,7 +492,6 @@
 			//修改科室名称处理
 			if(!StringUtils.equals(orgUnit.getOldName(), orgUnit.getName())){
 				updateOldData(orgUnit.getOrgUnitCoding(), orgUnit.getOldName(), orgUnit.getName());
-				appLogManager = (LogManager)SpringBeanManger.getBean("appLogManager");
 				appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_BASEDATA, "U",
 						"组织机构[" + orgUnit.getOldName() + "]修改名称为[" + orgUnit.getName() + "]科室编码为："
 								+ orgUnit.getOrgUnitCoding());
@@ -1478,7 +1481,6 @@
 	@Override
 	public boolean changeOrgUnitCoding(List<Map<String , String>> orgUnitChangeList , StringBuffer sqlParam){
 		boolean result = false;
-		appLogManager = (LogManager)SpringBeanManger.getBean("appLogManager");
 		//整个sql
 		StringBuffer allSql = new StringBuffer();
 		int i = 0;
@@ -1896,7 +1898,6 @@
 					description = StringTools.uniteTwoStringBySemicolon(description, ou.getName() + " (ID："+ ou.getId() + ", 科室编码：" + ou.getBarcode() + ")", " , ");
 				}
 				objectDao.batchSaveOrUpdate(orgUnitList);
-				appLogManager = (LogManager)SpringBeanManger.getBean("appLogManager");
 				appLogManager.saveLog(AcegiHelper.getLoginUser(), "组织机构管理", isDisabled + "科室", description);
 			}
 		}
Index: forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
===================================================================
diff -u -r26853 -r26891
--- forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java	(.../OrgUnitManager.java)	(revision 26853)
+++ forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java	(.../OrgUnitManager.java)	(revision 26891)
@@ -21,7 +21,7 @@
  */
 public interface OrgUnitManager extends BasePoManager<OrgUnit>{
 
-	public String getJsonChildrenNode(long parentId, String type);
+	public String getJsonChildrenNode(Long parentId, String type);
 
 	public String getCompanyTreeOfJsonByCompanyId(String parentId,
 			boolean isFromTraining);
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
===================================================================
diff -u -r26853 -r26891
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java	(.../RecyclingApplicationAction.java)	(revision 26853)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java	(.../RecyclingApplicationAction.java)	(revision 26891)
@@ -362,7 +362,7 @@
 		// 已停用的科室不能进行科室申领
 		String orgUnitCode = AcegiHelper.getCurrentOrgUnitCode();
 		OrgUnit ou = orgUnitManager.getByCode(orgUnitCode);
-		if (ou != null && ou.getStatus() == OrgUnit.STATUS_DISABLED) {
+		if (ou != null && OrgUnit.STATUS_DISABLED.equals(ou.getStatus())) {
 			StrutsResponseUtils.output(JSONUtil.buildJsonObject(false, "当前申请科室已停用，不能进行申领!"));
 			return;
 		}