Merge remote-tracking branch 'origin/master' into feature/获取用户敏感信息

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

@@ -207,13 +207,21 @@ public class MaterialServiceImpl implements MaterialService {
           if(from == 2) {
               url = entity.getImgUrl() ;
           }
-          String[] arr = url.split("/");
+          String[] arr = null ;
+          if(url.contains("?")) {
+              arr = url.split("\\?")[0].split("/") ;
+          }else {
+             arr = url.split("/");
+          }
           int count = arr.length;
           if(from==2) {
               // 朋友圈上传接口
-              if (type == 2) {
+              if(url.contains("?")) {
+                  
+              }else {
                   url+= "?imageView2/2/w/1440/h/1080" ;
               }
+              logger.info("url={}",url);
               jp = qywxSuiteApiService.uploadAttachment(qwDTO.getThirdCorpid(), config.getWxSuiteid(), CommonUtil.getFileByte(url), arr[count - 1], fileType.getCode());
           }else {
               // 群发上传

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

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/QwMessageController.java

@@ -130,6 +130,8 @@ public class QwMessageController extends WebBaseController {
             if(clerkType==2 && CollectionUtils.isEmpty(storeIdList)) {
                 return RestResponse.failure("-1","请选择门店");
             }
+        }else {
+            storeIdList = null ;
         }
         JSONObject json = new JSONObject();
         json.put("clerkIdList", clerkIdList);