From b1d01ea6fa62ce12c2e592b3315186f6b3c8359d Mon Sep 17 00:00:00 2001 From: xj qian <qianxj15@sina.com> Date: 星期三, 17 七月 2024 15:20:38 +0800 Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj --- jrj/project/business/BasicCode/ForwarderMaint.cpp | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jrj/project/business/BasicCode/ForwarderMaint.cpp b/jrj/project/business/BasicCode/ForwarderMaint.cpp index 6357734..cf41bc5 100644 --- a/jrj/project/business/BasicCode/ForwarderMaint.cpp +++ b/jrj/project/business/BasicCode/ForwarderMaint.cpp @@ -18,7 +18,7 @@ xstring m_username; xstring ContactID; xcell dw_cell; - + xstring m_EntityID = L""; public: ForwarderMaint(void* implPtr, HWND hWnd) :xframe(implPtr, hWnd) {} public: @@ -45,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; + 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"ForwarderID", GetGuid()); @@ -67,7 +67,7 @@ dw_base.SetItemString(1, L"Type", L"5"); 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()); /*xdwtable dw = new xdwtable; dw.setNativePointer(dw_base.GetCurTable()); xdwtable dwcon = new xdwtable; -- Gitblit v1.9.3