From 84ca4432867f1b2d033ca2918c8122f9ce98f820 Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期二, 30 七月 2024 16:09:09 +0800
Subject: [PATCH] update
---
jrj/project/business/SystemSettings/UserImport.cpp | 8 ++++----
jrj/xframe/xcontrol/xcombobox.hpp | 1 -
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/jrj/project/business/SystemSettings/UserImport.cpp b/jrj/project/business/SystemSettings/UserImport.cpp
index 00d9041..fb7b0a7 100644
--- a/jrj/project/business/SystemSettings/UserImport.cpp
+++ b/jrj/project/business/SystemSettings/UserImport.cpp
@@ -110,10 +110,10 @@
//trace(row);
KXMLDOMElement e = dw_list.GetRowElement(row);
trace(e.xml());
- xstring sEmployeeNo = e.selectSingleNode(L"EmployeeNo").text() + L"";
- xstring sOldEmpNo = e.selectSingleNode(L"OldEmpNo").text() + L"";
- xstring sPersonID = e.selectSingleNode(L"PersonID").text() + L"";
- xstring sPersonName = e.selectSingleNode(L"Name").text() + L"";
+ xstring sEmployeeNo = e.selectSingleNode(L"EmployeeNo").text() + (xstring)L"";
+ xstring sOldEmpNo = e.selectSingleNode(L"OldEmpNo").text() + (xstring)L"";
+ xstring sPersonID = e.selectSingleNode(L"PersonID").text() + (xstring)L"";
+ xstring sPersonName = e.selectSingleNode(L"Name").text() + (xstring)L"";
xstring sPassWord = xutil::MD5(sOldEmpNo);
/*
diff --git a/jrj/xframe/xcontrol/xcombobox.hpp b/jrj/xframe/xcontrol/xcombobox.hpp
index f1df0f1..2bed6f1 100644
--- a/jrj/xframe/xcontrol/xcombobox.hpp
+++ b/jrj/xframe/xcontrol/xcombobox.hpp
@@ -16,7 +16,6 @@
return *this;
}
public:
-
int GetCurSel()
{
int CB_GETCURSEL_ = 0x0147;
--
Gitblit v1.9.3