From 9786b6898c79f5de9ca7eeb168fe4b6f5b0d173f Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期五, 06 九月 2024 13:52:39 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

---
 jrj/project/business/Company/HrPersonAdd.cpp |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jrj/project/business/Company/HrPersonAdd.cpp b/jrj/project/business/Company/HrPersonAdd.cpp
index 595a32f..412d29c 100644
--- a/jrj/project/business/Company/HrPersonAdd.cpp
+++ b/jrj/project/business/Company/HrPersonAdd.cpp
@@ -6,12 +6,13 @@
 
 #include "vbusiness/vframe/listwin.vframe.vbusiness.hpp"
 #include "viewobject/view.base.hpp"
+//#include "HrEmployee.cpp"
 
 using xml = KXMLDOMDocument;
 class __declspec(dllexport) HrPersonAdd : public xframe
 {
 public:
-	HrEmployee lw_obj;
+	//HrEmployee* lw_obj;
 	xdwgrid	dw_list;
 
 	xnode	m_agentNode;	//Agent Condition
@@ -56,8 +57,7 @@
 
 	int  OnRetrieve()
 	{
-		control xc = new control;
-		xc.setNativePointer(GetControl(L"QueryTxt"));
+		xcontrol xc = GetControl(L"QueryTxt");
 		m_sTxt = xc.GetText() + L"";
 		xml x;
 

--
Gitblit v1.9.3