From b21969387682f5d57ea83da8790dd58ea921dbf9 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Thu, 2 Nov 2023 14:48:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E5=AE=B6=E4=BF=9D=E5=AD=98=E5=85=B6?=
 =?UTF-8?q?=E5=AE=83=E4=BF=A1=E6=81=AF=E7=9A=84=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pmapi/expert/service/impl/ExpertInfoServiceImpl.java       |  3 ++-
 .../com/ningdatech/pmapi/sys/manage/UserGuidanceManage.java    | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/impl/ExpertInfoServiceImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/impl/ExpertInfoServiceImpl.java
index d2e8b68..5366000 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/impl/ExpertInfoServiceImpl.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/impl/ExpertInfoServiceImpl.java
@@ -511,7 +511,8 @@ public class ExpertInfoServiceImpl implements ExpertInfoService {
                 // 删除专家来源标签 重新存入
                 iExpertTagService.remove(Wrappers.lambdaQuery(ExpertTag.class)
                         .eq(ExpertTag::getUserId, userId)
-                        .eq(ExpertTag::getExpertInfoField, ExpertTagEnum.EXPERT_SOURCE.getKey()));
+//                        .eq(ExpertTag::getExpertInfoField, ExpertTagEnum.EXPERT_SOURCE.getKey())
+                );
 
                 List<ExpertTag> saveExpertTagList = buildSaveExpertTagList(userId, expertTagList);
                 saveExpertTagList = saveExpertTagList.stream()
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/sys/manage/UserGuidanceManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/sys/manage/UserGuidanceManage.java
index 5610205..45b3340 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/sys/manage/UserGuidanceManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/sys/manage/UserGuidanceManage.java
@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.google.common.collect.Lists;
 import com.ningdatech.basic.function.VUtils;
 import com.ningdatech.pmapi.common.constant.BizConst;
+import com.ningdatech.pmapi.expert.entity.ExpertUserFullInfo;
+import com.ningdatech.pmapi.expert.service.ExpertInfoService;
+import com.ningdatech.pmapi.expert.service.IExpertUserFullInfoService;
 import com.ningdatech.pmapi.fiscal.entity.CompanyFiscalCode;
 import com.ningdatech.pmapi.fiscal.service.ICompanyFiscalCodeService;
 import com.ningdatech.pmapi.signature.entity.CompanySignature;
@@ -52,6 +55,8 @@ public class UserGuidanceManage {
 
     private final ICompanySignatureService signatureService;
 
+    private final IExpertUserFullInfoService expertUserFullInfoService;
+
     /**
      * 查询用户引导 详情
      * @param user
@@ -144,6 +149,11 @@ public class UserGuidanceManage {
                     .in(UserAuth::getUserId,repeatIds));
             userRoleService.remove(Wrappers.lambdaQuery(UserRole.class)
                     .in(UserRole::getUserId,repeatIds));
+            for(Long repeatId : repeatIds){
+                ExpertUserFullInfo expert = expertUserFullInfoService.getByUserId(repeatId);
+                expert.setUserId(userId);
+                expertUserFullInfoService.updateById(expert);
+            }
             return "删除成功";
         }
         return "不存在重复的用户";