From 8ae1c17d32d6867042fe1343ff0fc082deb11a8f Mon Sep 17 00:00:00 2001
From: wuqun <wu.qun@free-sun.com.cn>
Date: Mon, 17 Oct 2022 17:09:39 +0800
Subject: [PATCH] =?UTF-8?q?(*)=E5=AF=BC=E5=85=A5=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF,=20=E4=BA=BA=E5=91=98=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../humanAffairs/containers/import-members-modal.js         | 6 +++---
 .../src/sections/humanAffairs/containers/personnelFiles.jsx | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/web/client/src/sections/humanAffairs/containers/import-members-modal.js b/web/client/src/sections/humanAffairs/containers/import-members-modal.js
index 677e213..cf9a00c 100644
--- a/web/client/src/sections/humanAffairs/containers/import-members-modal.js
+++ b/web/client/src/sections/humanAffairs/containers/import-members-modal.js
@@ -238,9 +238,9 @@ const ImportMembersModal = props => {
                                     error(`第${i + 2}行人员编号为空，请填写`)
                                     return
                                 }
-                                let xqExist = xqMembers.find(m => m.peopleCode == number);
+                                let xqExist = xqMembers.find(m => m.userCode == number);
                                 if (!xqExist) {
-                                    error(`第${i + 2}行，项企中不存在该人员编号`)
+                                    error(`第${i + 2}行的人员编号无对应的员工信息`)
                                     return
                                 }
                                 if (postData.some(p => p.number == number)) {//人员编号 唯一
@@ -327,7 +327,7 @@ const ImportMembersModal = props => {
                                     return
                                 }
                                 postData.push({//人员编号 待办todotodo
-                                    pepUserId: xqExist.id, name, idNumber, gender, birthday, nativePlace, marital,
+                                    pepUserId: xqExist.pepUserId, name, idNumber, gender, birthday, nativePlace, marital,
                                     politicsStatus, phoneNumber, workPlace, graduatedFrom, educationBackground, specialty, graduationDate,
                                     hiredate, turnProbationPeriod, regularDate, dimissionDate, experienceYear, occupationalHistory,
                                     del: false, number
diff --git a/web/client/src/sections/humanAffairs/containers/personnelFiles.jsx b/web/client/src/sections/humanAffairs/containers/personnelFiles.jsx
index 7017c5f..7b3754f 100644
--- a/web/client/src/sections/humanAffairs/containers/personnelFiles.jsx
+++ b/web/client/src/sections/humanAffairs/containers/personnelFiles.jsx
@@ -31,6 +31,7 @@ const Rest = (props) => {
     }, [])
 
     function getMemberSearchList () {//搜索项企用户
+        dispatch(humanAffairs.getMemberSearch())
         dispatch(humanAffairs.getMemberList()).then((res) => {//搜索项企用户
             if (res.success) {
                 console.log('res.success', res.payload.data);
@@ -145,7 +146,7 @@ const Rest = (props) => {
                     </div>
                     <div style={{ display: 'flex', flexWrap: 'wrap', marginLeft: 30 }}>
                         {
-                            archivesList.map((item, index) => {
+                            archivesList?.rows?.map((item, index) => {
                                 return (
                                     <div key={index} style={{ display: 'flex', width: 368, border: '1px solid #F9F9F9', boxShadow: '0px 0px 4px 1px rgba(0,0,0,0.08)', padding: 10, marginRight: 40, marginBottom: 20 }}>
                                         <div style={{ width: 128, height: 192 }}>