空指针异常处理

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

@@ -192,6 +192,10 @@ public class MaterialServiceImpl implements MaterialService {
           if (type == 4) {
               fileType = QywxMediaTypeEnum.VIDEO;
               url = old.getLink();
+              //如果from == 2，取ImgUrl
+              if(from==2){
+                  url = old.getImgUrl();
+              }
           }
           if (type == 5) {
               fileType = QywxMediaTypeEnum.FILE;
@@ -208,11 +212,6 @@ public class MaterialServiceImpl implements MaterialService {
               url = entity.getImgUrl() ;
           }
           String[] arr = null ;
-          //空指针异常处理
-          if (url == null){
-              logger.info("url不存在！");
-              return jp;
-          }
           if(url.contains("?")) {
               arr = url.split("\\?")[0].split("/") ;
           }else {