From a4344c9bada0722c6ef7fac5d95f29a110eea0f1 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 21 四月 2025 10:32:05 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/HR/AdministrativeDepartment.cpp | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/jrj/project/business/HR/AdministrativeDepartment.cpp b/jrj/project/business/HR/AdministrativeDepartment.cpp
index b5a79a8..aee1a23 100644
--- a/jrj/project/business/HR/AdministrativeDepartment.cpp
+++ b/jrj/project/business/HR/AdministrativeDepartment.cpp
@@ -2,9 +2,6 @@
#include <xcontrol/xtreeview.hpp>
#include <xcontrol/xdwgrid.hpp>
#include <xcontrol/xcell.hpp>
-#if 0
-aaa
-#endif // 0
#include "vbusiness/vframe/listwin.vframe.vbusiness.hpp"
@@ -65,9 +62,9 @@
tv_folder.SetItemChild(hItem, 1);
for (int i = 0; i < len; i++)
{
- KXMLDOMElement& e = *new KXMLDOMElement(nlist.item(i));
+ KXMLDOMElement e = nlist.item(i);
xstring name = e.getAttribute(L"name");
- HTREEITEM h = tv_folder.InsertChildItem(hItem, name, (LPARAM)&e, image);//trust(e as int)将e放入树结构里面的data属性中
+ HTREEITEM h = tv_folder.InsertChildItem(hItem, name, e, image);//trust(e as int)将e放入树结构里面的data属性中
ExpandCatChildFolder(h, e, 35);
}
return 1;
@@ -84,9 +81,9 @@
int len = nlist.length();
for (int i = 0; i < len; i++)
{
- KXMLDOMElement& e = *new KXMLDOMElement(nlist.item(i));
+ KXMLDOMElement e = nlist.item(i);
xstring name = e.selectSingleNode(L"name").text();
- HTREEITEM h = tv_folder.InsertChildItem(hItem, name, (LPARAM)&e, 35);
+ HTREEITEM h = tv_folder.InsertChildItem(hItem, name, e, 35);
ExpandCatChildFolder(h, e, 35);
}
return 1;
@@ -124,10 +121,10 @@
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);
+ KXMLDOMElement e = tv_folder.GetItemData(hItem);
xstring name = e.getAttribute(L"name");
xml x = 0;
xstring parentid = L"";
@@ -155,12 +152,12 @@
if (changeddlb)
return 1;
HTREEITEM hItem = tv_folder.GetSelectedItem();
- if (hItem <= 0)
+ if (!hItem)
return 1;
HTREEITEM child = tv_folder.GetChildItem(hItem);
if (!child) {
HCURSOR hCursor = xutil::SetCursorWait();
- KXMLDOMElement& e = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
+ KXMLDOMElement e = tv_folder.GetItemData(hItem);
if (!e.getAttribute(L"name")) {
xstring adid = e.selectSingleNode(L"adid").text();
xstring parentid = adid;
@@ -181,10 +178,10 @@
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);
+ KXMLDOMElement e = tv_folder.GetItemData(hItem);
xstring parentid = L"";//父级id
if (!e.getAttribute(L"name"))
parentid = e.selectSingleNode(L"adid").text();
@@ -252,7 +249,7 @@
adid = ele.selectSingleNode(L"adid").text();*/
adid = dw_list.GetItemString(row, L"adid");
- xml x = new xml;
+ xml x ;
xaserverarg arg;
@@ -307,13 +304,14 @@
AttachEvent(L"WM_XCOMMAND", (FEvent)&ViewAdministrativeDepartmentList::OnXCommand);
//获取焦点事件，用于重置工具条
AttachEvent(L"WM_SETFOCUS", (FEvent)&ViewAdministrativeDepartmentList::OnSetFocus);
+ return 1;
}
/*
//加载主体数据
int OnRetrieve()
{
- xml x = new xml;
+ xml x ;
xaserverarg arg;
@@ -338,13 +336,13 @@
int len = nlist.length();
for (int i = 0; i < len; i++)
{
- KXMLDOMElement& e = *new KXMLDOMElement(nlist.item(i));
+ KXMLDOMElement e = nlist.item(i);
xstring name = e.getAttribute(L"name");
xstring sImage = e.getAttribute(L"image");
xstring child = e.getAttribute(L"child");
int image = 18;
if (sImage) image = sImage.toInt();
- HTREEITEM h = tv_folder.InsertChildItem(hItem, name, (LPARAM) & e, image);
+ HTREEITEM h = tv_folder.InsertChildItem(hItem, name, e, image);
if (child != L"no")
tv_folder.SetItemChild(h, 1);
ExpandChildFolder(h, e);
--
Gitblit v1.9.3