From a4344c9bada0722c6ef7fac5d95f29a110eea0f1 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 21 四月 2025 10:32:05 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/xframe/vbusiness/vutil/publiccode.vutil.vbusiness.hpp | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/jrj/xframe/vbusiness/vutil/publiccode.vutil.vbusiness.hpp b/jrj/xframe/vbusiness/vutil/publiccode.vutil.vbusiness.hpp
index 262ab32..5d151dd 100644
--- a/jrj/xframe/vbusiness/vutil/publiccode.vutil.vbusiness.hpp
+++ b/jrj/xframe/vbusiness/vutil/publiccode.vutil.vbusiness.hpp
@@ -2,7 +2,7 @@
#include <wobject/xwin.hpp>
#include <wobject/xurl.hpp>
-
+#include <memory.h>
struct PUser
{
string id;
@@ -46,7 +46,7 @@
}
//取当前用户
- static PUser* GetUser(xstring id)
+ static PUser& GetUser(xstring id)
{
string userno = xaserver::GetUserNo();
//trace(userno);
@@ -61,6 +61,7 @@
//trace(L"---%s",x.GetXml());
KXMLDOMElement e = x.documentElement();
PUser& p = *(new PUser);
+ ::memset(&p, 0,sizeof(PUser));
if (e)
{
if (e.selectSingleNode(L"任职")) p.id = e.selectSingleNode(L"任职").text();
@@ -89,9 +90,9 @@
if (e.selectSingleNode(L"电话")) p.tel = e.selectSingleNode(L"电话").text();
}
- return &p;
+ return p;
}
- static PUser* GetUser()
+ static PUser& GetUser()
{
return GetUser(L"");
}
@@ -238,7 +239,7 @@
//xml
//x.setNativePointer(xml::CreateInstance());
xaserverarg arg;
- arg.setNativePointer(arg.CreateInstance());
+
arg.AddArg(L"AssignmentID", sguid);
if (xaserver::ExecXQuery(L"", L"[getAssignment.xq]", arg.GetString(), x) == 1)
{
--
Gitblit v1.9.3