Merge branch 'xgh_内容中台' into 'developer'

图片

See merge request !480

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

@@ -193,7 +193,9 @@ public class MaterialServiceImpl implements MaterialService {
 	        int count = arr.length;
 	        JSONResponse jp = null ;
 	        if(from==2 && entity.getMediaType()==2) {
-	            url+= "?imageView2/2/w/1440/h/1080" ;
+	            if (type == 2) {
+	                url+= "?imageView2/2/w/1440/h/1080" ;
+	            }
 	            jp = qywxSuiteApiService.uploadAttachment(qwDTO.getThirdCorpid(), config.getWxSuiteid(), CommonUtil.getFileByte(url), arr[count - 1], fileType.getCode());
 	        }else {
 	            jp = qywxSuiteApiService.uploadMedia(qwDTO.getThirdCorpid(), config.getWxSuiteid(), CommonUtil.getFileByte(url), arr[count - 1], fileType.getCode());