From 19df926ceac02075e1c92b2e961a49e0385051cb Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 05 八月 2024 09:07:05 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

---
 jrj/project/business/SystemSettings/UserImport.cpp |    8 ++++----
 1 files changed, 4 insertions(+), 4 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);
 
 			/*

--
Gitblit v1.9.3