From 69ca48293b089073a494c36faafaee3f0c83e7a4 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期五, 28 六月 2024 14:48:08 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/SO3.list.cpp | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/jrj/project/business/SO3.list.cpp b/jrj/project/business/SO3.list.cpp
index 6056ff2..c75d8cc 100644
--- a/jrj/project/business/SO3.list.cpp
+++ b/jrj/project/business/SO3.list.cpp
@@ -285,12 +285,12 @@
return 1;
}
- int PreOnCmdDispatch(string comdid)
+ int PreOnCmdDispatch(xstring comdid)
{
if (comdid == L"action:bill.new")
{
- string s = publiccode::GetUser().id;
- string no = publiccode::GetUser().no;
+ xstring s = publiccode::GetUser().id;
+ xstring no = publiccode::GetUser().no;
if (no != L"00303" && no != L"admin")
{
KXMLDOMDocument supplier_x = ViewObject::RetrieveData(GetServerUrl(),L"/sale/data/SupplierV3/entity/FindBySaleType", L"id", s);
@@ -306,7 +306,7 @@
}
if (comdid == L"action:bill.annex")
{
- string deptname = publiccode::GetUser().deptname;
+ xstring deptname = publiccode::GetUser().deptname;
if (deptname == L"采购部")
{
return 1;
--
Gitblit v1.9.3