From 2390022d946ed3b0c2f3741320bf4c483e188311 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期五, 19 七月 2024 15:44:34 +0800
Subject: [PATCH] update maint
---
jrj/project/business/Company/HrPositionAdd.cpp | 5 ++---
jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp | 6 +++---
jrj/project/business/Supplier/maintex.Owner.Supplier.cpp | 0
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/jrj/project/business/Company/HrPositionAdd.cpp b/jrj/project/business/Company/HrPositionAdd.cpp
index 9336e7e..41d604b 100644
--- a/jrj/project/business/Company/HrPositionAdd.cpp
+++ b/jrj/project/business/Company/HrPositionAdd.cpp
@@ -87,9 +87,9 @@
HTREEITEM hItem = nmtv.itemNew.hItem;
//int wid = tv_1.GetId();
- HTREEITEM hItem = tv_1.GetSelectedItem();
+ hItem = tv_1.GetSelectedItem();
HTREEITEM rootItem = tv_1.GetRootItem();
- if (hItem <= 0 || hItem == rootItem)
+ if (!hItem || hItem == rootItem)
{
m_type = L"all";
}
@@ -150,7 +150,6 @@
}
//treeview tv_org = new treeview;
//tv_org.setNativePointer(lw_obj->tv_org);
- HTREEITEM wid = lw_obj->tv_org.GetId();
HTREEITEM hitem = tv_1.GetSelectedItem();
KXMLDOMElement ele = tv_1.GetItemData( hitem);
xstring sOrgID = ele.selectSingleNode(L"@guid").text();
diff --git a/jrj/project/business/Supplier/maintex.Owner.Supplier.cpp b/jrj/project/business/Supplier/maintex.Owner.Supplier.cpp
index 19e8157..80200ee 100644
--- a/jrj/project/business/Supplier/maintex.Owner.Supplier.cpp
+++ b/jrj/project/business/Supplier/maintex.Owner.Supplier.cpp
Binary files differ
diff --git a/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp b/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp
index ae37a70..f0f46b6 100644
--- a/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp
+++ b/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp
@@ -12,7 +12,7 @@
{
public:
KXMLDOMDocument m_configDoc;
- string m_EntityID;
+ xstring m_EntityID;
maint(void* implPtr, HWND hWnd) :xframe(implPtr, hWnd) {
this->SetArg();
@@ -154,8 +154,8 @@
//trace(L"maint:"+index.toString());
//alert(L"xq.xml = "+d.GetXml());
//trace(L"xxx");
- string dwname = L"";//e.selectsingleNode(L"@name").text();
- string tpy = L"dwgrid";
+ xstring dwname = L"";//e.selectsingleNode(L"@name").text();
+ xstring tpy = L"dwgrid";
if (e.selectSingleNode(L"@name")) dwname = e.selectSingleNode(L"@name").text();
if (e.selectSingleNode(L"@type")) tpy = e.selectSingleNode(L"@type").text();
if (tpy == L"dwgrid")
--
Gitblit v1.9.3