Merge branch 'feature/xgh/2405迭代' into 'master'

加好友

See merge request !1827

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

@@ -18,7 +18,7 @@ public interface TabHaobanExternalClerkRelatedMapper {
 
     int updateByPrimaryKeySelective(TabHaobanExternalClerkRelated record);
 
-    int selectByClerkIdAndExternalUserId(@Param("clerkId") String clerkId,
+    int selectByClerkIdAndExternalUserId(@Param("staffId") String staffId,
                                                                    @Param("externalUserId") String externalUserId);
 
     int delByUserIdAndExternalUserId(@Param("externalUserId") String externalUserId , @Param("staffId") String staffId);

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

@@ -87,15 +87,15 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
 
     @Override
     public void insert(TabHaobanExternalClerkRelated related) {
-        String clerkId = related.getClerkId();
+        String staffId = related.getStaffId() ;
         String externalUserId = related.getExternalUserId();
-        String lockKey = "addExternalUser:"+externalUserId+clerkId ;
-        int num1 = mapper.selectByClerkIdAndExternalUserId(clerkId, externalUserId);
+        String lockKey = "addExternalUser:"+externalUserId+staffId ;
+        int num1 = mapper.selectByClerkIdAndExternalUserId(staffId, externalUserId);
         if(num1 > 0) {
             return ;
         }
         RedisUtil.lock(lockKey,2L);
-        int num2 = mapper.selectByClerkIdAndExternalUserId(clerkId, externalUserId);
+        int num2 = mapper.selectByClerkIdAndExternalUserId(staffId, externalUserId);
         logger.info("好友数={},{},{}",num1,num2,externalUserId);
         if (num2 == 0) {
             String uuId = StringUtil.randomUUID();

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

@@ -231,7 +231,7 @@
         select
          count(*)
         from tab_haoban_external_clerk_related
-        where clerk_id = #{clerkId,jdbcType=VARCHAR}
+        where staff_id = #{staffId}
         and external_user_id = #{externalUserId}
         and status_flag = 1
     </select>
@@ -918,7 +918,7 @@
     <select id="halfDelFriendPage" resultMap="BaseResultMap">
         select  <include refid="Base_Column_List"/>  from tab_haoban_external_clerk_related
         where wx_enterprise_id = #{wxEnterpriseId} and status_flag in (1,3,4)  and external_status = 3
-            and half_del_time is null  limit ${startItem}, 1000
+            and half_del_time is null  limit  1000
     </select>
 
     <update id="updateHalfTime">