Merge branch 'bugfix/2023-03-28' into 'master'

Bugfix/2023 03 28

See merge request !1076

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

@@ -162,10 +162,12 @@ public class MaterialServiceImpl implements MaterialService {
 	      JSONResponse jp = new JSONResponse() ;
 	      MaterialDTO old = null ;
           TabMaterialContent entity =null ;
+          Boolean flag = false;
           if(from == 1) {
               old = this.selectMaterialById(materialId);
           }
           if(from == 2) {
+              flag=true;
               entity =this.materialContentMapper.selectById(materialId) ;
               if(null != entity) {
                   old = EntityUtil.changeEntityByJSON(MaterialDTO.class, entity) ;
@@ -192,6 +194,10 @@ public class MaterialServiceImpl implements MaterialService {
           if (type == 4) {
               fileType = QywxMediaTypeEnum.VIDEO;
               url = old.getLink();
+              //如果视频的话，取ImgUrl
+              if(flag){
+                  url = old.getImgUrl();
+              }
           }
           if (type == 5) {
               fileType = QywxMediaTypeEnum.FILE;