离职继承,查询好友自建商户使用自建的字段查询

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanExternalClerkRelatedMapper.java

@@ -159,6 +159,9 @@ public interface TabHaobanExternalClerkRelatedMapper {
      */
     TabHaobanExternalClerkRelated getLastByExTernalUseridAndWxUserIdNoStatus(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("externalUserid") String externalUserid, @Param("staffId") String staffId);
 
+    TabHaobanExternalClerkRelated getLastByExTernalUseridAndWxUserIdNoStatusSelf(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("externalUserid") String externalUserid, @Param("staffId") String staffId);
+
+
     /**
      * 根据id 查询列表
      *

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/HandoverServiceImpl.java

@@ -106,7 +106,7 @@ public class HandoverServiceImpl implements HandoverService {
                 return;
             }
             List<TabHandoverExternal> externalList = list.stream().map(dto -> {
-                TabHandoverExternal mid = getHandExternal(dto, qwDTO.getWxEnterpriseId(), handoverStaff);
+                TabHandoverExternal mid = getHandExternal(dto, qwDTO.getWxEnterpriseId(), handoverStaff,qwDTO.isSelf());
                 mid.setStaffId(handoverStaff.getStaffId());
                 handoverStaff.setDimissionTime(dto.getDimissionTimeDate());
                 mid.setStatusFlag(mid.getStatusFlag() != null ? mid.getStatusFlag() : 1);
@@ -214,7 +214,7 @@ public class HandoverServiceImpl implements HandoverService {
      * @param infoDTO
      * @return
      */
-    private TabHandoverExternal getHandExternal(QywxUnassignedInfoDTO infoDTO, String wxEnterpriseId, TabHandoverStaff handoverStaff) {
+    private TabHandoverExternal getHandExternal(QywxUnassignedInfoDTO infoDTO, String wxEnterpriseId, TabHandoverStaff handoverStaff,boolean selfFlag) {
         TabHandoverExternal handoverExternal = handoverExternalMapper.getByExternalUserIdAndStaffId(wxEnterpriseId, handoverStaff.getStaffId(), infoDTO.getExternalUserid());
         if (null != handoverExternal) {
             return handoverExternal;
@@ -223,7 +223,12 @@ public class HandoverServiceImpl implements HandoverService {
         mid.setExternalUserId(infoDTO.getExternalUserid());
         mid.setWxEnterpriseId(wxEnterpriseId);
         mid.setHaobanFriendFlag(0);
-        TabHaobanExternalClerkRelated externalClerkRelated = externalClerkRelatedMapper.getLastByExTernalUseridAndWxUserIdNoStatus(wxEnterpriseId, infoDTO.getExternalUserid(), handoverStaff.getStaffId());
+        TabHaobanExternalClerkRelated externalClerkRelated = null ;
+        if(selfFlag) {
+            externalClerkRelated = externalClerkRelatedMapper.getLastByExTernalUseridAndWxUserIdNoStatusSelf(wxEnterpriseId, infoDTO.getExternalUserid(), handoverStaff.getStaffId());
+        }else {
+            externalClerkRelated = externalClerkRelatedMapper.getLastByExTernalUseridAndWxUserIdNoStatus(wxEnterpriseId, infoDTO.getExternalUserid(), handoverStaff.getStaffId());
+        }
         if (null == externalClerkRelated) {
             mid.setExternalUserName("企业微信客户");
             mid.setRelationId("-1");

haoban-manage3-service/src/main/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml

@@ -500,6 +500,18 @@
         and external_user_id = #{externalUserid}
         order by create_time desc limit 1
     </select>
+
+    <select id="getLastByExTernalUseridAndWxUserIdNoStatusSelf" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from tab_haoban_external_clerk_related
+        where wx_enterprise_id = #{wxEnterpriseId}
+        and staff_id = #{staffId}
+        and self_external_userid = #{externalUserid}
+        order by create_time desc limit 1
+    </select>
+
+
     <select id="listByIds" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>