From a5289d51bd57a99a2377c5590bc61cb7a42e61d4 Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期四, 18 七月 2024 12:15:47 +0800
Subject: [PATCH] upadte

---
 jrj/project/business/SystemSettings/UserImport.cpp |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/jrj/project/business/SystemSettings/UserImport.cpp b/jrj/project/business/SystemSettings/UserImport.cpp
index 809ca0f..00d9041 100644
--- a/jrj/project/business/SystemSettings/UserImport.cpp
+++ b/jrj/project/business/SystemSettings/UserImport.cpp
@@ -100,9 +100,9 @@
 		xstring sPositionID, sPositionName;
 		xstring sOrgID, sOrgName;
 		xstring sJobID, sJobName;
-		int wid = lw_obj.tv_usergroup.GetId();
-		int hitem = tv_org.GetSelectedItem(wid);
-		KXMLDOMElement ele = tv_org.GetItemData(wid, hitem);
+		//int wid = lw_obj.tv_usergroup.GetId();
+		HTREEITEM hitem = tv_org.GetSelectedItem();
+		KXMLDOMElement ele = tv_org.GetItemData(hitem);
 
 
 		while (row > 0)
@@ -163,8 +163,8 @@
 	}
 	int OnSubTree(xstring id, HTREEITEM parentitem)
 	{
-		int wid = tv_org.GetId();
-		if (tv_org.GetChildItem(wid, parentitem) > 0) return 1;
+		//int wid = tv_org.GetId();
+		if (tv_org.GetChildItem( parentitem) > 0) return 1;
 		xml x;
 
 		xaserverarg arg;
@@ -207,11 +207,11 @@
 		return 1;
 	}
 
-	int OnCreateTree(xstring id, int parentitem)
+	int OnCreateTree(xstring id, HTREEITEM parentitem)
 	{
 		//while (tv_1.GetRootItem()>0)
 		//	tv_1.DeleteItem(tv_1.GetRootItem());				
-		int wid = tv_org.GetId();
+		//int wid = tv_org.GetId();
 		xml x;
 
 		x.loadXML(L"<item><id>" + id + L"</id><no/><name>凤凰集团</name><typ>Org</typ></item>");
@@ -219,8 +219,8 @@
 		//KXMLDOMElement RDoc = x.documentElement();
 		//KXMLDOMElement ele = RDoc.SelectSingleNode(L"//Org");
 		KXMLDOMElement ele = x.selectSingleNode(L"//item");
-		int hItem = tv_org.InsertChildItemEx(wid, 0, L"凤凰集团", ele, 15, 4);
-		tv_org.SetItemChild1(wid, hItem, 1);
+		HTREEITEM hItem = tv_org.InsertChildItem( 0, L"凤凰集团", ele, 15, 4);
+		tv_org.SetItemChild1(hItem, 1);
 		return 1;
 
 		/*xaserverarg arg;
@@ -260,7 +260,7 @@
 
 		HCURSOR hCursor = xutil::SetCursorWait();
 		//xstring id = tv_org.GetItemData(tv_org.GetId(), sitem);
-		KXMLDOMElement ele = tv_org.GetItemData(tv_org.GetId(), sitem);
+		KXMLDOMElement ele = tv_org.GetItemData(sitem);
 		xstring id = ele.selectSingleNode(L"id").text();
 		OnSubTree(id, sitem);
 		xutil::RestoreCursor(hCursor);
@@ -270,7 +270,7 @@
 	int OnTreeSelChanged(TEvent* evt, LPARAM p)
 	{
 		//int wid = tv_org.GetId();
-		int hitem = tv_org.GetSelectedItem();
+		HTREEITEM hitem = tv_org.GetSelectedItem();
 		KXMLDOMElement ele = tv_org.GetItemData(hitem);
 		if (ele)
 		{
@@ -317,8 +317,7 @@
 
 	int onload()
 	{
-		tv_org = new treeview;
-		tv_org.setNativePointer(GetControl(L"tv_org"));
+		tv_org = GetControl(L"tv_org");
 		dw_list = new xdwgrid;
 		dw_list.setNativePointer(GetControl(L"dw_list"));
 		dw_list.openUrl(L"系统用户.vface/template/SysUser/EmpSelect");

--
Gitblit v1.9.3