From 35d07b6e7d26dba5869d298567ef53b75867c258 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 30 十月 2024 12:15:30 +0800
Subject: [PATCH] update
---
jrj/project/business/Company/HrOrg.cpp | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/jrj/project/business/Company/HrOrg.cpp b/jrj/project/business/Company/HrOrg.cpp
index 4c8234d..5dfe6b7 100644
--- a/jrj/project/business/Company/HrOrg.cpp
+++ b/jrj/project/business/Company/HrOrg.cpp
@@ -96,11 +96,11 @@
return -1;
}
//trace(x.GetXml());
- var list = x.selectNodes(L"//Org");
- int i = 0, s = list.length;
+ auto list = x.selectNodes(L"//Org");
+ int i = 0, s = list.length();
KXMLDOMElement xitem;
xstring sname;
- xstring sguid;
+ //xstring sguid;
if (s > 0)
{
for (i = 0; i < s; i++)
@@ -129,7 +129,9 @@
NMTREEVIEW& nmtv = *(NMTREEVIEW*)evt->notify.pnmh;
HTREEITEM sitem = nmtv.itemNew.hItem;
- xstring id = tv_org.GetItemData(sitem);
+ return 1;
+
+ xstring id = (string)tv_org.GetItemData(sitem);
HCURSOR hCursor = xutil::SetCursorWait();
OnCreateTree(id, sitem);
xutil::RestoreCursor(hCursor);
@@ -167,10 +169,11 @@
//sRootOrgName = ele1.selectSingleNode(L"CompanyID/@_displaystring").text();
}
- xstring ls_orgid = ele.selectSingleNode(L"@guid").text();
- sOrgID = ls_orgid + L"";
- //trace(sOrgID);
- sOrgName = ele.selectSingleNode(L"OrgName").text();
+ string str = ele.xml();
+ if(ele.selectSingleNode(L"@guid"))
+ sOrgID = ele.selectSingleNode(L"@guid").text();
+ if(ele.selectSingleNode(L"OrgName"))
+ sOrgName = ele.selectSingleNode(L"OrgName").text();
OnRetrieve();
return 1;
}
@@ -386,14 +389,12 @@
str += L"<treeitem src='xquery:[OrgChart.hr.xq]' src1='xquery:[OrgStructureRetrieve.xq]' xcaption='OrgName' xroot='/root' xpath='Org' xchildpath='Org' image='15' loop='yes' xdata='.'/>";
str += L"</xtree></vbox>";
xstring xfNodeAgentArea = L"tree";
- xnode anode = new xnode;
- anode.setNativePointer(GetAgentNode(xfNodeAgentArea));
+ xnode anode = GetAgentNode(xfNodeAgentArea);
SetAgentNode(anode, str);
- tv_org = new treeview;
- tv_org.setNativePointer(GetControl(L"tv_org"));
+ tv_org = GetControl(L"tv_org");
AttachEvent(L"tv_org", L"TVN_SELCHANGED", (FEvent)&HrOrg::OnTreeSelecded);
HTREEITEM root = tv_org.GetRootItem();
- if (root > 0)
+ if (!root)
{
tv_org.ExpandItemEx(root);
}
@@ -440,7 +441,7 @@
AttachEvent(L"WM_SETFOCUS", (FEvent)&HrOrg::OnSetFocus);
//获得树的点击事件
AttachEvent(L"tv_org", L"TVN_SELCHANGED", (FEvent)&HrOrg::OnTreeSelecded);
- AttachEvent(L"tv_org", L"TVN_ITEMEXPANDING", (FEvent)&HrOrg::OnTreeExpanding);
+ //AttachEvent(L"tv_org", L"TVN_ITEMEXPANDING", (FEvent)&HrOrg::OnTreeExpanding);
AttachEvent(L"tv_org", L"TVN_ENDDRAG", (FEvent)&HrOrg::OnTreeMoveNode);
//双击
AttachEvent(L"dw_list", L"DWV_DOUBLECLICKED", (FEvent)&HrOrg::OnDoubleClicked);
@@ -458,10 +459,8 @@
int onload()
{
- tv_org = new treeview;
- tv_org.setNativePointer(GetControl(L"tv_org"));
- dw_list = new xdwgrid;
- dw_list.setNativePointer(GetControl(L"dw_list"));
+ tv_org = GetControl(L"tv_org");
+ dw_list = GetControl(L"dw_list");
dw_list.openUrl(L"组织架构.vface/template/HrOrg/list");
dw_list.SetSelectionMode(1);
dw_list.SetReadOnly(true);
@@ -475,15 +474,16 @@
//OnCreateTree(L"00000000-0000-0000-0000-000000000000", 0);
HTREEITEM root = tv_org.GetRootItem();
- if (root > 0)
+ if (root)
{
tv_org.ExpandItemEx(root);
KXMLDOMElement ele = tv_org.GetItemData(root);
if (ele)
{
- xstring ls_orgid = ele.selectSingleNode(L"@guid").text();
- sOrgID = ls_orgid + L"";
- sOrgName = ele.selectSingleNode(L"OrgName").text();
+ if(ele.selectSingleNode(L"@guid"))
+ sOrgID = ele.selectSingleNode(L"@guid").text();
+ if(ele.selectSingleNode(L"OrgName"))
+ sOrgName = ele.selectSingleNode(L"OrgName").text();
OnRetrieve();
}
}
--
Gitblit v1.9.3