Merge remote-tracking branch 'origin/feature-02-22' into feature-02-22

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

@@ -285,11 +285,16 @@ public interface TabHaobanExternalClerkRelatedMapper {
 
     /**
      * 客户好友需触达列表
+     *
+     * @param wxEnterpriseId wx企业标识
+     * @param wxUserId       wx用户id
      * @param enterpriseId
      * @param externalUserId
-     * @return
+     * @return {@link TabHaobanExternalClerkRelated }
+     * @author mozhu
+     * @date 2022-02-11 14:15:25
      */
-    List<TabHaobanExternalClerkRelated> listByEnterpriseIdAndExternalUserId(@Param("enterpriseId") String enterpriseId,
-                                                            @Param("externalUserId") String externalUserId);
+    TabHaobanExternalClerkRelated getByEnterpriseIdAndExternalUserId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("wxUserId") String wxUserId,
+                                                                     @Param("enterpriseId") String enterpriseId, @Param("externalUserId") String externalUserId);
 
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/ExternalUserPojo.java

@@ -15,6 +15,8 @@ public class ExternalUserPojo implements Serializable{
 	private String addCreateTime;
 	
 	private String externalUserId;
+
+	private String wxUserId;
 	/**
 	 * 好友类型
 	 * 1表示该外部联系人是微信用户，2表示该外部联系人是企业微信用户
@@ -76,8 +78,12 @@ public class ExternalUserPojo implements Serializable{
 	public void setExternalUserId(String externalUserId) {
 		this.externalUserId = externalUserId;
 	}
-	
-	
-	
 
+	public String getWxUserId() {
+		return wxUserId;
+	}
+
+	public void setWxUserId(String wxUserId) {
+		this.wxUserId = wxUserId;
+	}
 }

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

@@ -622,13 +622,16 @@
     </select>
 
 
-    <select id="listByEnterpriseIdAndExternalUserId" resultMap="BaseResultMap">
+    <select id="getByEnterpriseIdAndExternalUserId" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
         from tab_haoban_external_clerk_related
-        where enterprise_id = #{enterpriseId}
-        and status_flag = 4
+        where  wx_user_id = #{wxUserId,jdbcType=VARCHAR}
+        and wx_enterprise_id = #{wxEnterpriseId}
+        and enterprise_id = #{enterpriseId}
         and external_user_id = #{externalUserId}
+        and status_flag = 4
+        order by update_time desc limit 1
     </select>
 
 </mapper>
\ No newline at end of file