From 438405d6293c2e4a99af869f30febf7d06417587 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期二, 25 六月 2024 17:47:49 +0800
Subject: [PATCH] update customer
---
jrj/xframe/src/xstring.cpp | 9 +++++++--
jrj/project/business/Customer3.maint.cpp | 4 +---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/jrj/project/business/Customer3.maint.cpp b/jrj/project/business/Customer3.maint.cpp
index 6a7b2c2..9f9ba77 100644
--- a/jrj/project/business/Customer3.maint.cpp
+++ b/jrj/project/business/Customer3.maint.cpp
@@ -1191,8 +1191,7 @@
if (GetParam())
{
- int iArgs = GetParam();
- xaserverarg& args = *new xaserverarg;
+ xaserverarg& args = *(xaserverarg * )GetParam();
//alert(args.GetString());
xstring CustomerGood = args.GetArgString(L"CustomerGood");
@@ -1214,7 +1213,6 @@
xsheet.SelectSheet(nIndex);
//xsheet.SetSheetState(0, 0);
}
-
ApplyStatus=dw_detail.GetItemString(1,L"ApplyStatus");
diff --git a/jrj/xframe/src/xstring.cpp b/jrj/xframe/src/xstring.cpp
index 23f1c2c..2fcb5dc 100644
--- a/jrj/xframe/src/xstring.cpp
+++ b/jrj/xframe/src/xstring.cpp
@@ -284,8 +284,13 @@
xstring& xstring::operator =(const xstring& rhs)
{
if (data)((KStringBlock<wchar_t>*)data)->Release();
- ((KStringBlock<wchar_t>*)rhs.data)->AddRef();
- data = rhs.data;
+ if (rhs.data)
+ {
+ ((KStringBlock<wchar_t>*)rhs.data)->AddRef();
+ data = rhs.data;
+ }
+ else
+ data = nullptr;
return *this;
}
xstring& xstring::operator =(const wchar_t* rhs)
--
Gitblit v1.9.3