From cf8dba7748cc9826d744069b5063a14e3fcd2fa8 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 13 三月 2025 10:48:17 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

---
 jrj/project/business/SystemSettings/Data.config.cpp |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jrj/project/business/SystemSettings/Data.config.cpp b/jrj/project/business/SystemSettings/Data.config.cpp
index 0af5433..4a3fe1d 100644
--- a/jrj/project/business/SystemSettings/Data.config.cpp
+++ b/jrj/project/business/SystemSettings/Data.config.cpp
@@ -65,7 +65,7 @@
 		xml x;
 
 		xaserverarg arg;
-		arg.setNativePointer(arg.CreateInstance());
+		
 		arg.AddArg(L"pid", id);
 		arg.AddArg(L"tree", xid);
 		//if(xaserver::ExecXQuery(GetServerUrl(),L"[selectRoleInt.xq]",arg.GetString(),x)!=1)
@@ -87,7 +87,7 @@
 		xml x;
 
 		xaserverarg arg;
-		arg.setNativePointer(arg.CreateInstance());
+		
 		arg.AddArg(L"id", id);
 		trace(id);
 		arg.AddArg(L"flag", L"-1");
@@ -98,7 +98,7 @@
 			return -1;
 		}
 
-		if (x.xml() == L"")
+		if ((xstring)x.xml() == L"")
 			x.loadXML(L"<root><items/><roles/></root>");
 
 		xml x1;
@@ -494,7 +494,7 @@
 			return -1;
 		}
 
-		if (x.xml() == L"")
+		if ((xstring)x.xml() == L"")
 			x.loadXML(L"<root><items/><roles/></root>");
 
 		KXMLDOMElement e = x.documentElement();

--
Gitblit v1.9.3