From f22bb7edb66856f3d1b6e44d6f6b170848a48dd7 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期二, 16 七月 2024 08:37:26 +0800
Subject: [PATCH] updte

---
 jrj/project/business/Company/HrPositionAdd.cpp |   34 ++++++++++++++++------------------
 1 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/jrj/project/business/Company/HrPositionAdd.cpp b/jrj/project/business/Company/HrPositionAdd.cpp
index 8173dc8..9336e7e 100644
--- a/jrj/project/business/Company/HrPositionAdd.cpp
+++ b/jrj/project/business/Company/HrPositionAdd.cpp
@@ -6,13 +6,14 @@
 
 #include "vbusiness/vframe/listwin.vframe.vbusiness.hpp"
 #include "viewobject/view.base.hpp"
+#include "HrPosition.hpp"
 
 using xml = KXMLDOMDocument;
 class __declspec(dllexport) HrPositionAdd : public xframe
 {
 public:
 
-	HrPosition lw_obj;
+	HrPosition* lw_obj;
 	xdwgrid	dw_list;
 	xtreeview		tv_1;
 	xstring 	m_type;
@@ -116,8 +117,8 @@
 						return -1;
 					}
 					//trace(x.GetXml());
-					var list = x.selectNodes(L"//Type");
-					int i = 0, s = list.length;
+					auto list = x.selectNodes(L"//Type");
+					int i = 0, s = list.length();
 					KXMLDOMElement e;
 					xstring sname;
 					if (s > 0)
@@ -136,9 +137,7 @@
 				{
 					if (GetWinParam())
 					{
-						lw_obj = new HrPosition;
-						lw_obj.setNativePointer(GetParam());
-						lw_obj = GetParam();
+						lw_obj = (HrPosition*)GetWinParam();
 					}
 					else
 						return 0;
@@ -150,8 +149,8 @@
 						return 1;
 					}
 					//treeview    tv_org   =  new treeview;
-					//tv_org.setNativePointer(lw_obj.tv_org);
-					HTREEITEM wid = lw_obj.tv_org.GetId();
+					//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();
@@ -162,14 +161,14 @@
 						xstring sJobID = e.selectSingleNode(L"@guid").text() + (xstring)L"";
 						xstring sJobName = e.selectSingleNode(L"JobName").text() + (xstring)L"";
 
-						int nRow = lw_obj.dw_list.InsertRow(0);
-						lw_obj.dw_list.SetItemString(nRow, L"JobID", sJobID);
-						lw_obj.dw_list.SetItemDisplayString(nRow, L"JobID", sJobName);
-						lw_obj.dw_list.SetItemString(nRow, L"Status", L"Y");
-						lw_obj.dw_list.SetItemDisplayString(nRow, L"Status", L"有效");
-						lw_obj.dw_list.SetItemString(nRow, L"OrgID", sOrgID);
-						lw_obj.dw_list.SetItemDisplayString(nRow, L"OrgID", sOrgName);
-						lw_obj.dw_list.SetItemString(nRow, L"PositionName", sOrgName + sJobName);
+						int nRow = lw_obj->dw_list.InsertRow(0);
+						lw_obj->dw_list.SetItemString(nRow, L"JobID", sJobID);
+						lw_obj->dw_list.SetItemDisplayString(nRow, L"JobID", sJobName);
+						lw_obj->dw_list.SetItemString(nRow, L"Status", L"Y");
+						lw_obj->dw_list.SetItemDisplayString(nRow, L"Status", L"有效");
+						lw_obj->dw_list.SetItemString(nRow, L"OrgID", sOrgID);
+						lw_obj->dw_list.SetItemDisplayString(nRow, L"OrgID", sOrgName);
+						lw_obj->dw_list.SetItemString(nRow, L"PositionName", sOrgName + sJobName);
 						row = dw_list.GetNextSelectRow(row + 1);
 					}
 					CloseWindow();
@@ -214,8 +213,7 @@
 				{
 					SetArg();
 					m_type = L"all";
-					tv_1 = new treeview;
-					tv_1.setNativePointer(GetControl(L"tv_1"));
+					tv_1 = GetControl(L"tv_1");
 					dw_list = new xdwgrid;
 					dw_list.setNativePointer(GetControl(L"dw_list"));
 					dw_list.openUrl(L"组织架构.vface/template/HrJob/list");

--
Gitblit v1.9.3