From eb007f5b2329dde9e5a9b00e0816d0ac686c83f3 Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Tue, 18 Oct 2022 16:35:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E4=BA=8B=E5=8D=A1=E7=89=87BUG?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/organization/entity/personnelcard/User.java  | 3 +++
 .../mapper/personnelcard/PersonnelCardMapper.xml            | 4 ++--
 .../engine/organization/util/relation/ResourceSyncUtil.java | 6 ++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/com/engine/organization/entity/personnelcard/User.java b/src/com/engine/organization/entity/personnelcard/User.java
index aa95cf90..78afd4c9 100644
--- a/src/com/engine/organization/entity/personnelcard/User.java
+++ b/src/com/engine/organization/entity/personnelcard/User.java
@@ -42,6 +42,9 @@ public class User {
     public String getImage() {
         weaver.hrm.User user = new weaver.hrm.User();
         user.setLanguage(LanguageService.getDefaultLang());
+        if(StringUtils.isNotBlank(image)&& image.contains("/")){
+            return image;
+        }
         return FieldDefinedValueUtil.getFieldValue(user, ExtendInfoPO.builder().controlType(6).browserType("1").build(), image);
     }
 }
diff --git a/src/com/engine/organization/mapper/personnelcard/PersonnelCardMapper.xml b/src/com/engine/organization/mapper/personnelcard/PersonnelCardMapper.xml
index e6f990a3..535c9bd6 100644
--- a/src/com/engine/organization/mapper/personnelcard/PersonnelCardMapper.xml
+++ b/src/com/engine/organization/mapper/personnelcard/PersonnelCardMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.engine.organization.mapper.personnelcard.PersonnelCardMapper">
     <resultMap id="UserMap" type="com.engine.organization.entity.personnelcard.User">
         <result column="id" property="id"/>
-        <result column="messager_url" property="image"/>
+        <result column="resource_image_id" property="image"/>
         <result column="last_name" property="name"/>
         <result column="sex" property="sex"/>
         <result column="email" property="email"/>
@@ -28,7 +28,7 @@
 
     <select id="getUserById" resultMap="UserMap">
         select id,
-               messager_url,
+               resource_image_id,
                last_name,
                sex,
                email,
diff --git a/src/com/engine/organization/util/relation/ResourceSyncUtil.java b/src/com/engine/organization/util/relation/ResourceSyncUtil.java
index 2de6c23d..dc269a01 100644
--- a/src/com/engine/organization/util/relation/ResourceSyncUtil.java
+++ b/src/com/engine/organization/util/relation/ResourceSyncUtil.java
@@ -985,6 +985,7 @@ public class ResourceSyncUtil {
     }
 
     public static Map<String,Object> convertEcResourceParams(Map<String, Object> params){
+        // TODO  先查询原有EC人员信息，再封装传参
         Map<String, Object> convertParams = new HashMap<>();
         String jclResourceId  = Util.null2String(params.get("id"));
         String ecResourceId = "";
@@ -1005,7 +1006,7 @@ public class ResourceSyncUtil {
 
         convertParams.put("loginid",params.get("login_id"));
         convertParams.put("accounttype",params.get("account_type"));
-        convertParams.put("password",params.get("pass_word"));
+        // convertParams.put("password",params.get("pass_word"));
         convertParams.put("seclevel",params.get("sec_level"));
         convertParams.put("workstartdate",params.get("work_start_date"));
         convertParams.put("companystartdate",params.get("company_start_date"));
@@ -1014,7 +1015,8 @@ public class ResourceSyncUtil {
         convertParams.put("lastname",params.get("last_name"));
         convertParams.put("sex",params.get("sex"));
         convertParams.put("resourceimageid",params.get("resource_image_id"));
-        convertParams.put("joblevel",params.get("job_level"));
+        // 职级
+        //convertParams.put("joblevel",params.get("job_level"));
         convertParams.put("jobactivitydesc",params.get("job_activity_desc"));
         convertParams.put("managerid",params.get("manager_id"));
         convertParams.put("assistantid",params.get("assistant_id"));