修复加好友判断企业id

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

@@ -40,7 +40,7 @@ public interface TabHaobanExternalClerkRelatedMapper {
 
 	List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserId(@Param("externalUserid")String externalUserid, @Param("userId")String wxUserId);
 
-    List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserIdAllStatus(@Param("externalUserid") String externalUserid, @Param("userId") String wxUserId);
+    List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserIdAllStatus(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("externalUserid") String externalUserid, @Param("userId") String wxUserId);
 
     List<TabHaobanExternalClerkRelated> listByEnterpriseIdAndDate(@Param("enterpriseId")String enterpriseId,@Param("date")Date date);
 

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

@@ -36,7 +36,7 @@ public interface ExternalClerkRelatedService {
 
 	List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserId(String externalUserid, String wxUserId);
 
-	List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserIdAllStatus(String externalUserid, String wxUserId);
+	List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserIdAllStatus(String wxEnterpriseId, String externalUserid, String wxUserId);
 
 	ExternalClerkRelatedDTO getByMemberId(String wxUserId, String memberId);
 

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

@@ -92,8 +92,8 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
 	}
 
 	@Override
-	public List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserIdAllStatus(String externalUserid, String wxUserId) {
-		return mapper.listByExTernalUseridAndWxUserIdAllStatus(externalUserid, wxUserId);
+	public List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserIdAllStatus(String wxEnterpriseId, String externalUserid, String wxUserId) {
+		return mapper.listByExTernalUseridAndWxUserIdAllStatus(wxEnterpriseId, externalUserid, wxUserId);
 	}
 
 	@Override

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

@@ -498,7 +498,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
                 log.info("生产会员memnerid失败：{}", unionId);
                 return;
             }
-            List<TabHaobanExternalClerkRelated> externalClerkRelateds = externalClerkRelatedService.listByExTernalUseridAndWxUserIdAllStatus(dto.getExternalUserid(), dto.getWxUserId());
+            List<TabHaobanExternalClerkRelated> externalClerkRelateds = externalClerkRelatedService
+                    .listByExTernalUseridAndWxUserIdAllStatus(wxEnterpriseId, dto.getExternalUserid(), dto.getWxUserId());
             if (CollectionUtils.isEmpty(externalClerkRelateds)) {
                 log.info("新增TabHaobanExternalClerkRelated");
                 TabHaobanExternalClerkRelated related = new TabHaobanExternalClerkRelated();
@@ -584,7 +585,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     private void addFriendByWelcome(MemberUnionidRelatedDTO dto, StaffClerkRelationDTO staffClerkRelationDTO) {
         String relationKey = SecureUtil.md5(staffClerkRelationDTO.getClerkId() + dto.getExternalUserid());
         //保存好友关系
-        List<TabHaobanExternalClerkRelated> externalClerkRelateds = externalClerkRelatedService.listByExTernalUseridAndWxUserIdAllStatus(dto.getExternalUserid(), dto.getWxUserId());
+        List<TabHaobanExternalClerkRelated> externalClerkRelateds = externalClerkRelatedService
+                .listByExTernalUseridAndWxUserIdAllStatus(staffClerkRelationDTO.getWxEnterpriseId(), dto.getExternalUserid(), dto.getWxUserId());
         if (CollectionUtils.isEmpty(externalClerkRelateds)) {
             log.info("新增TabHaobanExternalClerkRelated");
             TabHaobanExternalClerkRelated related = new TabHaobanExternalClerkRelated();
@@ -1530,7 +1532,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             memberUnionRelatedService.update(exsitDTO);
         }
 
-        List<TabHaobanExternalClerkRelated> clerkRelateds = externalClerkRelatedService.listByExTernalUseridAndWxUserIdAllStatus(externalUserId, wxUserId);
+        List<TabHaobanExternalClerkRelated> clerkRelateds = externalClerkRelatedService.listByExTernalUseridAndWxUserIdAllStatus(wxEnterpriseId, externalUserId, wxUserId);
         if (CollectionUtils.isEmpty(clerkRelateds)) {
             TabHaobanExternalClerkRelated related = new TabHaobanExternalClerkRelated();
             related.setAddCreateTime(createTime);
@@ -1649,7 +1651,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             memberUnionRelatedService.update(exsitDTO);
         }
 
-        List<TabHaobanExternalClerkRelated> clerkRelateds = externalClerkRelatedService.listByExTernalUseridAndWxUserIdAllStatus(externalUserId, wxUserId);
+        List<TabHaobanExternalClerkRelated> clerkRelateds = externalClerkRelatedService.listByExTernalUseridAndWxUserIdAllStatus(wxEnterpriseId, externalUserId, wxUserId);
         if (CollectionUtils.isEmpty(clerkRelateds)) {
             TabHaobanExternalClerkRelated related = new TabHaobanExternalClerkRelated();
             related.setAddCreateTime(createTime);

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

@@ -356,6 +356,7 @@
     from tab_haoban_external_clerk_related
     where wx_user_id = #{userId,jdbcType=VARCHAR}
     and external_user_id = #{externalUserid}
+      and wx_enterprise_id = #{wxEnterpriseId}
     and status_flag in(1,3,4)
   </select>
   <select id="listByEnterpriseIdAndDate" resultMap="BaseResultMap" parameterType="java.lang.String">