Merge remote-tracking branch 'origin/master_xgh_118' into developer

Conflicts:
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/MaterialServiceImpl.java
	haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml

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

@@ -1550,7 +1550,11 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         unionDTO.setExternalUserid(dto.getExternalUserId());
         unionDTO.setSelfExternalUserid(dto.getSelfExternalUserId());
         unionDTO.setMemberUnionidRelatedId(memberUnionidRelatedId);
-        this.saveExternalClerk(memberId, staffId, unionDTO, staffClerkRelation, 1);
+        int statusFlag = 1 ;
+        if(StringUtils.isBlank(memberId)) {
+            statusFlag = 3 ;
+        }
+        this.saveExternalClerk(memberId, staffId, unionDTO, staffClerkRelation, statusFlag);
         if(StringUtils.isNotBlank(memberId)) {
             this.pushTagSync(memberId, wxEnterpriseId, enterpriseId);
             log.info("通知会员 更新为企微好友 memberId:{}", memberId);

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

@@ -442,7 +442,7 @@
     
      <select id="listByStoreIds" resultType="com.gic.haoban.manage.api.dto.StaffClerkRelationDTO">
      	<include refid="leftJoinStaffSQL"/>
-        where a.status_flag=1 and b.status_flag=1  
+        where a.status_flag=1 and b.status_flag=1 
         <if test="null != storeIds">
         	and a.store_id in
 	        <foreach collection="storeIds" index="index" item="item" open="(" separator="," close=")">