Merge branch 'feature/五月二期' into 'master'

Feature/五月二期

See merge request !1296

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

@@ -408,4 +408,11 @@ public interface TabHaobanExternalClerkRelatedMapper {
      */
     List<String> listByWxEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("enterpriseIdList") List<String> enterpriseIdList);
 
+    /**
+     * 删除企业微信下面,所有外部联系人是null的成员
+     * @param wxEnterpriseId
+     * @param enterpriseIdList
+     */
+    void deleteByWxEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("enterpriseIdList") List<String> enterpriseIdList);
+
 }
\ No newline at end of file

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

@@ -106,4 +106,11 @@ public interface ExternalClerkRelatedService {
 	 */
 	List<String> listByWxEnterpriseId(String wxEnterpriseId,List<String> enterpriseIdList);
 
+	/**
+	 * 删除企业微信下面,所有外部联系人是null的成员
+	 * @param wxEnterpriseId
+	 * @param enterpriseIdList
+	 */
+	void deleteByWxEnterpriseId(String wxEnterpriseId,List<String> enterpriseIdList);
+
 }

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

@@ -525,4 +525,9 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
     public List<String> listByWxEnterpriseId(String wxEnterpriseId, List<String> enterpriseIdList) {
         return this.mapper.listByWxEnterpriseId(wxEnterpriseId,enterpriseIdList);
     }
+
+    @Override
+    public void deleteByWxEnterpriseId(String wxEnterpriseId, List<String> enterpriseIdList) {
+        this.mapper.deleteByWxEnterpriseId(wxEnterpriseId,enterpriseIdList);
+    }
 }

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

@@ -1202,6 +1202,8 @@ public class StaffApiServiceImpl implements StaffApiService {
                             "刷新企业微信好友(定时任务处理)", SyncTaskTypeEnum.FRIEND_SINGLE.getType());
                     if (StringUtils.isNotBlank(taskId)) {
                         dealSyncOperationApiService.dealWxFriendClerkSingle(taskId, staffId, staffId, wxEnterpriseId);
+                        //上述刷新企业好友走的是新增数据，所以需要额外去删除外部联系人id为空的数据
+                        externalClerkRelatedService.deleteByWxEnterpriseId(wxEnterpriseId,enterpriseIdList);
                     }
                 }
             }

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

@@ -808,4 +808,17 @@
 	    AND external_user_id IS NULL
     </select>
 
+    <update id="deleteByWxEnterpriseId" >
+        update  tab_haoban_external_clerk_related
+        set status_flag = 2,update_time = now()
+        WHERE
+        wx_enterprise_id = #{wxEnterpriseId}
+        AND enterprise_id IN
+        <foreach collection="enterpriseIdList" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+        AND status_flag = 1
+        AND external_user_id IS NULL
+    </update>
+
 </mapper>
\ No newline at end of file