From a660be8441928b8c6d51a2212bcaace358f8ca82 Mon Sep 17 00:00:00 2001 From: xj qian <qianxj15@sina.com> Date: 星期三, 17 七月 2024 16:04:18 +0800 Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj --- jrj/project/business/BasicCode/ExpressMaint.cpp | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/jrj/project/business/BasicCode/ExpressMaint.cpp b/jrj/project/business/BasicCode/ExpressMaint.cpp index a58ca65..440ba75 100644 --- a/jrj/project/business/BasicCode/ExpressMaint.cpp +++ b/jrj/project/business/BasicCode/ExpressMaint.cpp @@ -17,6 +17,7 @@ xstring m_username; xstring ContactID; xcell dw_cell; + xstring m_EntityID = L""; public: ExpressMaint(void* implPtr, HWND hWnd) :xframe(implPtr, hWnd) {} public: @@ -44,13 +45,13 @@ xstring GetGuid() { - return TApp::GetGuid(); + return publiccode::GetGuid(); } int OnClear() { if (m_EntityID == L"") { - trace(1); - m_userid = TApp::GetUserInfo().id; - m_username = TApp::GetUserInfo().name; + //trace(1); + m_userid = publiccode::GetUser().id; + m_username = publiccode::GetUser().name; dw_base = new xdwtable; dw_base.setNativePointer(GetControl(L"dw_base")); dw_base.SetItemString(1, L"PartyID", GetGuid()); @@ -64,7 +65,7 @@ dw_base.SetItemString(1, L"Type", L"8"); dw_base.SetItemString(1, L"EnterName", m_userid); dw_base.SetItemDisplayString(1, L"EnterName", m_username); - dw_base.SetItemString(1, L"CreateDate", TApp::GetCurDate()); + dw_base.SetItemString(1, L"CreateDate", publiccode::GetCurrentDate()); dw_base.SetItemString(1, L"PBAStatus", L"Y"); -- Gitblit v1.9.3