From 15d1eebb57ee9f2dcae0750408ecd308c60b771f Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期二, 02 七月 2024 18:26:20 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

---
 jrj/project/business/SO/maint.Document.SO3.v3.cpp |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jrj/project/business/SO/maint.Document.SO3.v3.cpp b/jrj/project/business/SO/maint.Document.SO3.v3.cpp
index 843f83b..4ca8b6f 100644
--- a/jrj/project/business/SO/maint.Document.SO3.v3.cpp
+++ b/jrj/project/business/SO/maint.Document.SO3.v3.cpp
@@ -122,7 +122,7 @@
 			xstring name = d.mid(d.find(L"|##@@|",0)+6, d.length());
 			*/
 		
-			xaserver::__CreateDirectory(L"C:/Temp");
+			xaserver::CreateDirectory(L"C:/Temp");
 			if (arg)
 			{
 				if (arg.GetArgString(L"process") == L"data")
@@ -241,7 +241,7 @@
 
 			xstring name = ele.getAttribute(L"caption");
 			
-			xaserver::__CreateDirectory(L"C:/Temp");
+			xaserver::CreateDirectory(L"C:/Temp");
 			xstring str = file.left(2);
 			xstring ext = L"";
 			if (name.find(L".") >= 0) ext = name.mid(name.find(L"."), name.length());
@@ -369,7 +369,7 @@
 		/*
 		int  OnRetrieve()
 		{
-			xml x = new xml;
+			xml x ;
 			x.setNativePointer(xml::CreateInstance());
 			xaserverarg arg = new xaserverarg;
 			arg.setNativePointer(arg.CreateInstance());
@@ -454,7 +454,7 @@
 
 			if (GetWinParam())
 			{
-				xaserverarg arg;
+				xaserverarg arg= GetArg();
 				entityid = arg.GetArgString(L"entityid");
 				Type = arg.GetArgString(L"Type");
 				ApprovalStatus = arg.GetArgString(L"ApprovalStatus");

--
Gitblit v1.9.3