feat：新增该会员是否是该企业下的好友列表

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/ExternalClerkRelatedApiService.java

@@ -132,8 +132,8 @@ public interface ExternalClerkRelatedApiService {
     List<ExternalClerkRelatedShortInfoDTO> listExternalClerkByMemberIds(String wxEnterpriseId, List<String> memberIds);
 
     /**
-     * 获取企业下的关联关系列表
-     *
+     * 获取会员下的关联关系列表
+     * @param memberId
      * @return
      */
     List<ExternalClerkRelatedShortInfoDTO> listExternalClerkByMemberId(String memberId);
@@ -192,7 +192,7 @@ public interface ExternalClerkRelatedApiService {
      * @param clerkId
      * @return
      */
-    public int countFriendCountByClerkId(String wxEnterpriseId, String enterpriseId, String wxUserId, String clerkId);
+    int countFriendCountByClerkId(String wxEnterpriseId, String enterpriseId, String wxUserId, String clerkId);
 
 
     /**
@@ -204,4 +204,15 @@ public interface ExternalClerkRelatedApiService {
      * @date 2021-12-30 16:24:02
      */
     void updateNewExternalUseridMq(String res);
+
+    /**
+     * 当前企业好友关系列表
+     *
+     * @param memberId     会员id
+     * @param enterpriseId 企业标识
+     * @return {@link List<ExternalClerkRelatedShortInfoDTO> }
+     * @author mozhu
+     * @date 2022-01-19 16:52:12
+     */
+    List<ExternalClerkRelatedShortInfoDTO> listByMemberIdAndEnterpriseId(String memberId,String enterpriseId);
 }

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

@@ -178,11 +178,12 @@ public interface TabHaobanExternalClerkRelatedMapper {
 
     /**
      * 查询会员在企业下的好友关系 根据会员id
-     *
      * @param memberId
+     * @param enterpriseId
      * @return
      */
-    List<TabHaobanExternalClerkRelated> listByMemberId(@Param("memberId") String memberId);
+    List<TabHaobanExternalClerkRelated> listByMemberId(@Param("memberId") String memberId,
+                                                       @Param("enterpriseId") String enterpriseId);
 
     /**
      * 查询会员在企业下的好友关系 根据会员id

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

@@ -250,7 +250,7 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
 
     @Override
     public List<ExternalClerkRelatedShortInfoDTO> listExternalClerkByMemberId(String memberId) {
-        List<TabHaobanExternalClerkRelated> list = tabHaobanExternalClerkRelatedMapper.listByMemberId(memberId);
+        List<TabHaobanExternalClerkRelated> list = tabHaobanExternalClerkRelatedMapper.listByMemberId(memberId, null);
         return EntityUtil.changeEntityListNew(ExternalClerkRelatedShortInfoDTO.class, list);
     }
 
@@ -389,8 +389,15 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
 
     }
 
+    @Override
+    public List<ExternalClerkRelatedShortInfoDTO> listByMemberIdAndEnterpriseId(String memberId, String enterpriseId) {
+        List<TabHaobanExternalClerkRelated> list = tabHaobanExternalClerkRelatedMapper.listByMemberId(memberId, enterpriseId);
+        return EntityUtil.changeEntityListNew(ExternalClerkRelatedShortInfoDTO.class, list);
+    }
+
     /**
      * 更新状态
+     *
      * @param corpid
      * @param wxEnterpriseId
      */
@@ -435,8 +442,8 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
             List<TabHaobanExternalClerkRelated> enterprisePageInfoList = tabHaobanWxEnterprisePageInfo.getList();
             if (CollectionUtils.isEmpty(enterprisePageInfoList)) {
                 if (pageNum == 1) {
-                    log.info("如果没有好友，直接转换完成..corpid:{}",corpid);
-                    updateAgreeExternalUseridFlag(corpid,wxEnterpriseId);
+                    log.info("如果没有好友，直接转换完成..corpid:{}", corpid);
+                    updateAgreeExternalUseridFlag(corpid, wxEnterpriseId);
                 }
                 break;
             }

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

@@ -530,6 +530,9 @@
         from tab_haoban_external_clerk_related
         where member_id = #{memberId}
         and status_flag = 1
+        <if test="enterpriseId != null and enterpriseId != ''">
+            and enterprise_id = #{enterpriseId}
+        </if>
     </select>
 
     <select id="listByExternalUserId" resultMap="BaseResultMap">