Commit ffaf18c5 by 徐高华

Merge branch 'master_xgh_118' into 'master'

朋友圈

See merge request !892
parents d0f39e56 21ba1761
...@@ -207,13 +207,21 @@ public class MaterialServiceImpl implements MaterialService { ...@@ -207,13 +207,21 @@ public class MaterialServiceImpl implements MaterialService {
if(from == 2) { if(from == 2) {
url = entity.getImgUrl() ; 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; int count = arr.length;
if(from==2) { if(from==2) {
// 朋友圈上传接口 // 朋友圈上传接口
if (type == 2) { if(url.contains("?")) {
}else {
url+= "?imageView2/2/w/1440/h/1080" ; 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()); jp = qywxSuiteApiService.uploadAttachment(qwDTO.getThirdCorpid(), config.getWxSuiteid(), CommonUtil.getFileByte(url), arr[count - 1], fileType.getCode());
}else { }else {
// 群发上传 // 群发上传
......
...@@ -442,10 +442,13 @@ ...@@ -442,10 +442,13 @@
<select id="listByStoreIds" resultType="com.gic.haoban.manage.api.dto.StaffClerkRelationDTO"> <select id="listByStoreIds" resultType="com.gic.haoban.manage.api.dto.StaffClerkRelationDTO">
<include refid="leftJoinStaffSQL"/> <include refid="leftJoinStaffSQL"/>
where a.status_flag=1 and b.status_flag=1 and a.store_id in where a.status_flag=1 and b.status_flag=1
<foreach collection="storeIds" index="index" item="item" open="(" separator="," close=")"> <if test="null != storeIds">
#{item} and a.store_id in
</foreach> <foreach collection="storeIds" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="null != wxEnterpriseId"> <if test="null != wxEnterpriseId">
and a.wx_enterprise_id = #{wxEnterpriseId} and a.wx_enterprise_id = #{wxEnterpriseId}
</if> </if>
......
...@@ -130,6 +130,8 @@ public class QwMessageController extends WebBaseController { ...@@ -130,6 +130,8 @@ public class QwMessageController extends WebBaseController {
if(clerkType==2 && CollectionUtils.isEmpty(storeIdList)) { if(clerkType==2 && CollectionUtils.isEmpty(storeIdList)) {
return RestResponse.failure("-1","请选择门店"); return RestResponse.failure("-1","请选择门店");
} }
}else {
storeIdList = null ;
} }
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("clerkIdList", clerkIdList); json.put("clerkIdList", clerkIdList);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment