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

---
 jrj/xframe/vbusiness/vframe/frame.vframe.vbusiness.hpp |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jrj/xframe/vbusiness/vframe/frame.vframe.vbusiness.hpp b/jrj/xframe/vbusiness/vframe/frame.vframe.vbusiness.hpp
index 9b6f92d..76b8051 100644
--- a/jrj/xframe/vbusiness/vframe/frame.vframe.vbusiness.hpp
+++ b/jrj/xframe/vbusiness/vframe/frame.vframe.vbusiness.hpp
@@ -167,13 +167,13 @@
 			if (MessageBoxW(GetHWND(),L"是否确定删除记录!",L"提示", 1) == 2)
 				return 1;
 		}
-
+		
 		xaserverarg& arg = *(new xaserverarg);
 		arg.AddArg(L"Action", action);
 		KXMLDOMDocument x;
 
 		xstring aurl =L"/workflow/query/actioninfo/" + action;
-
+		
 		if (xurl::get(GetServerUrl(),aurl,L"", x) != 1)
 			return -1;
 
@@ -284,8 +284,8 @@
 			if (x1.selectSingleNode(L"//process"))
 			{
 				KXMLDOMElement e1 = x1.selectSingleNode(L"//process");
-				string valid = e1.getAttribute(L"valid");
-				string finished = e1.getAttribute(L"finished");
+				xstring valid = e1.getAttribute(L"valid");
+				xstring finished = e1.getAttribute(L"finished");
 				xstring errInfo =L"";
 				if (valid ==L"0")
 				{

--
Gitblit v1.9.3