From aa966512d0b4bc7fe9df2b0c5a38413db0ed3e4c Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 03 七月 2024 23:12:40 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

---
 jrj/project/business/HR/AdministrativeDepartment.cpp |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/jrj/project/business/HR/AdministrativeDepartment.cpp b/jrj/project/business/HR/AdministrativeDepartment.cpp
index 12df8bb..7556789 100644
--- a/jrj/project/business/HR/AdministrativeDepartment.cpp
+++ b/jrj/project/business/HR/AdministrativeDepartment.cpp
@@ -121,7 +121,7 @@
 		int OnPreRetrieve()
 		{
 			HTREEITEM hItem = tv_folder.GetSelectedItem();
-			if (hItem <= 0) return 1;
+			if (!hItem ) return 1;
 
 			//int 	hCursor = xutil::SetCursorWait();
 			KXMLDOMElement& e = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
@@ -152,7 +152,7 @@
 			if (changeddlb)
 				return 1;
 			HTREEITEM hItem = tv_folder.GetSelectedItem();
-			if (hItem <= 0)
+			if (!hItem)
 				return 1;
 			HTREEITEM child = tv_folder.GetChildItem(hItem);
 			if (!child) {
@@ -178,7 +178,7 @@
 		int OnAdd()
 		{
 			HTREEITEM hItem = tv_folder.GetSelectedItem();
-			if (hItem <= 0)
+			if (!hItem )
 				return 1;
 			HCURSOR hCursor = xutil::SetCursorWait();
 			KXMLDOMElement& e = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
@@ -304,6 +304,7 @@
 			AttachEvent(L"WM_XCOMMAND", (FEvent)&ViewAdministrativeDepartmentList::OnXCommand);
 			//获取焦点事件,用于重置工具条
 			AttachEvent(L"WM_SETFOCUS", (FEvent)&ViewAdministrativeDepartmentList::OnSetFocus);
+			return 1;
 		}
 
 		/*

--
Gitblit v1.9.3