From a4109ffda40aea56267b5f21be25c9a42c10209a Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期五, 18 十月 2024 13:56:24 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

---
 jrj/project/business/Company/HrOrgMaint.cpp |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/jrj/project/business/Company/HrOrgMaint.cpp b/jrj/project/business/Company/HrOrgMaint.cpp
index 9f23955..467694a 100644
--- a/jrj/project/business/Company/HrOrgMaint.cpp
+++ b/jrj/project/business/Company/HrOrgMaint.cpp
@@ -88,13 +88,13 @@
 		xstring val;
 		xml x;
 
-		var xdoc = x;
+		auto xdoc = x;
 		dw_detail.DwUpdateAllTo(xdoc);
-		val = xdoc.xml;
+		val = xdoc.xml();
 		//trace(val);
 		//return 1;
 		xaserverarg args;
-		args.setNativePointer(args.CreateInstance());
+		
 		args.AddArg(L"content", val);
 		//trace(val);
 		xml x1;
@@ -202,8 +202,8 @@
 				xstring sPersonID = arg.GetArgString(L"sPersonID");
 				//trace(sPersonID);
 				xstring sPersonName = arg.GetArgString(L"sPersonName");
-				dw_detail.SetItemDisplayString(1, colname, sPersonName);
-				dw_detail.SetItemString(1, colname, sPersonID);
+				dw_detail.SetItemDisplayString(1, colname.c_str(), sPersonName);
+				dw_detail.SetItemString(1, colname.c_str(), sPersonID);
 				dw_detail.Redraw();
 			}
 		}

--
Gitblit v1.9.3