From 603ab7247ae05f56cb992a8a683f5a2e0ccf67b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Wed, 1 Nov 2023 13:42:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=9E=E4=B9=A6=E6=8E=A8=E9=80=81=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/cool/store/dao/EnterpriseUserDAO.java  | 2 +-
 .../java/com/cool/store/mapper/EnterpriseUserMapper.java | 2 +-
 .../src/main/resources/mapper/EnterpriseUserMapper.xml   | 4 ++--
 .../com/cool/store/service/impl/EcSyncServiceImpl.java   | 6 +++---
 .../store/service/impl/EnterpriseSyncServiceImpl.java    | 9 +++++++++
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java
index 169d765e8..28119d2af 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java
@@ -147,7 +147,7 @@ public class EnterpriseUserDAO {
         return userList.stream().filter(o->!StringUtils.isAnyBlank(o.getMobile(), o.getName())).collect(Collectors.toMap(k -> k.getUserId(), Function.identity()));
     }
 
-    public String selectByMobile(String mobile) {
+    public EnterpriseUserDO selectByMobile(String mobile) {
         return  enterpriseUserMapper.selectByMobile(mobile);
     }
 
diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java
index 948ff8e5a..c2e2b70f4 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java
@@ -101,7 +101,7 @@ public interface EnterpriseUserMapper {
      */
     List<EnterpriseUserDO> getUserListByRegionIds(@Param("regionIds") List<String> regionIds);
 
-    String selectByMobile(@Param("mobile") String mobile);
+    EnterpriseUserDO selectByMobile(@Param("mobile") String mobile);
 
     EnterpriseUserDO selectByInvestmentManager(@Param("investmentManager") String investmentManager);
 
diff --git a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml
index 2cd5366f1..16cf19ea8 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml
@@ -332,8 +332,8 @@
         SUBSTR(jobnumber,1,1),
         CAST(SUBSTR(jobnumber,2) AS UNSIGNED) ASC
     </select>
-    <select id="selectByMobile" resultType="java.lang.String">
-        SELECT  user_id FROM  enterprise_user WHERE  mobile =#{mobile}  and  deleted=0 LIMIT 1
+    <select id="selectByMobile" resultMap="BaseResultMap">
+        SELECT   <include refid="Base_Column_List"/> FROM  enterprise_user WHERE  mobile =#{mobile}  and  deleted=0 LIMIT 1
     </select>
     <select id="selectByInvestmentManager"  resultMap="BaseResultMap">
         SELECT
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java
index 991c99000..040daafee 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java
@@ -429,13 +429,13 @@ public class EcSyncServiceImpl implements EcSyncService {
     private String getInvestmentManager(String followUserName, String followUserMobile) throws ApiException {
         //传递过来有跟进人的情况下查询跟进人是否存在
         if (StringUtil.isNotEmpty(followUserMobile) && StringUtil.isNotEmpty(followUserName)) {
-            String userId = enterpriseUserDAO.selectByMobile(followUserMobile);
-            if (StringUtil.isEmpty(userId)) {
+            EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.selectByMobile(followUserMobile);
+            if (enterpriseUserDO==null) {
                 // 给飞书群发送消息 跟进人找不到
                 sendFeiShuRobotMessage("推送：飞书架构中找不到该用户：【" + followUserName + "】，该用户电话号码为：" + followUserMobile, "27243d49-97ca-4981-8aec-7c3bf84eb660");
                 throw new ApiException("飞书架构中找不到该用户：【" + followUserName + "】，该用户电话号码为：" + followUserMobile);
             }
-            return userId;
+            return enterpriseUserDO.getUserId();
         }
         return "";
     }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseSyncServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseSyncServiceImpl.java
index 45c727577..49964f45e 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseSyncServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseSyncServiceImpl.java
@@ -211,6 +211,15 @@ public class EnterpriseSyncServiceImpl implements EnterpriseSyncService {
                     enterpriseUserRoleDAO.deleteUserRole(userDetail.getUserId());
                 }
                 EnterpriseUserDO enterpriseUser = EnterpriseUserDTO.transUserDtoToDo(userDetail, regionPathMap, leaderDeptMap, eventType);
+                if(StringUtils.isNotBlank(enterpriseUser.getMobile())){
+                    EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.selectByMobile(enterpriseUser.getMobile());
+                    //如果没有用户信息 但是飞书推的是更新的事件
+                    if (enterpriseUserDO==null){
+                        log.info("没有用户信息 但是飞书推的是更新的事件");
+                        enterpriseUserDO.setIsLeader(Boolean.FALSE);
+                        enterpriseUserDO.setLeaderDeptIds("[]");
+                    }
+                }
                 enterpriseUserDAO.batchInsertOrUpdate(new ArrayList<>(Arrays.asList(enterpriseUser)));
                 userRegionMappingDAO.batchInsertOrUpdateUserRegion(UserRegionMappingDO.convertSyncDO(Arrays.asList(enterpriseUser)));
                 userRegionMappingDAO.deleteUserRegionByUserId(userDetail.getUserId(), DataSourceEnum.SYNC, departmentLists);