From 9ac9cc9e9cd91b97d35a6e28400df71630765e40 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 21 八月 2024 14:35:51 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/SystemSettings/UserImport.cpp | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/jrj/project/business/SystemSettings/UserImport.cpp b/jrj/project/business/SystemSettings/UserImport.cpp
index 0ef3160..2180585 100644
--- a/jrj/project/business/SystemSettings/UserImport.cpp
+++ b/jrj/project/business/SystemSettings/UserImport.cpp
@@ -6,7 +6,8 @@
#include "vbusiness/vframe/listwin.vframe.vbusiness.hpp"
#include "viewobject/view.base.hpp"
-//use "dev:code[SysUser.vx]"
+
+#include "SysUser.hpp"
using xml = KXMLDOMDocument;
class __declspec(dllexport) UserImport : public xframe
@@ -99,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)
@@ -109,10 +110,10 @@
//trace(row);
KXMLDOMElement e = dw_list.GetRowElement(row);
trace(e.xml());
- xstring sEmployeeNo = e.selectSingleNode(L"EmployeeNo").text() + L"";
- xstring sOldEmpNo = e.selectSingleNode(L"OldEmpNo").text() + L"";
- xstring sPersonID = e.selectSingleNode(L"PersonID").text() + L"";
- xstring sPersonName = e.selectSingleNode(L"Name").text() + L"";
+ xstring sEmployeeNo = e.selectSingleNode(L"EmployeeNo").text() + (xstring)L"";
+ xstring sOldEmpNo = e.selectSingleNode(L"OldEmpNo").text() + (xstring)L"";
+ xstring sPersonID = e.selectSingleNode(L"PersonID").text() + (xstring)L"";
+ xstring sPersonName = e.selectSingleNode(L"Name").text() + (xstring)L"";
xstring sPassWord = xutil::MD5(sOldEmpNo);
/*
@@ -162,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;
@@ -206,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>");
@@ -218,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;
@@ -259,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);
@@ -269,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)
{
@@ -310,14 +311,13 @@
int OnInitial()
{
SetAgent();
- OnAttachEvent();
+ OnAttachEvent();
return 1;
}
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");
@@ -327,7 +327,7 @@
OnInitial();
OnCreateTree(L"00000000-0000-0000-0000-000000000000", 0);
//int wid = tv_org.GetId();
- int root = tv_org.GetRootItem();
+ HTREEITEM root = tv_org.GetRootItem();
tv_org.ExpandItem(root);
OnRetrieve(L"00000000-0000-0000-0000-000000000000");
return 1;
--
Gitblit v1.9.3