From 31a803602d5320269f2269ed0e036c8119c232b5 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 07 十一月 2024 13:54:24 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

---
 jrj/project/business/Company/HrOrg.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/jrj/project/business/Company/HrOrg.cpp b/jrj/project/business/Company/HrOrg.cpp
index baceac9..5dfe6b7 100644
--- a/jrj/project/business/Company/HrOrg.cpp
+++ b/jrj/project/business/Company/HrOrg.cpp
@@ -131,7 +131,7 @@
 
 		return 1;
 
-		xstring id = tv_org.GetItemData(sitem);
+		xstring id = (string)tv_org.GetItemData(sitem);
 		HCURSOR hCursor = xutil::SetCursorWait();
 		OnCreateTree(id, sitem);
 		xutil::RestoreCursor(hCursor);

--
Gitblit v1.9.3