Merge branch 'feature/xgh/bug/0415' into 'master'

Feature/xgh/bug/0415

See merge request !1784

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

@@ -231,7 +231,7 @@ public class MaterialApiServiceImpl implements MaterialApiService {
         }
         if (type == 3) {
             String imgUrl = materialDTO.getImgUrl();
-            String oldImgUrl = materialDTO.getImgUrl();
+            String oldImgUrl = old.getImgUrl();
             if (!imgUrl.equals(oldImgUrl)) {
                 JSONResponse response = qywxSuiteApiService.uploadImage(qwDTO.getThirdCorpid(), qwDTO.getSelf3thSecret(), imgUrl ,qwDTO.isSelf(),qwDTO.getUrlHost());
                 String wxImgUrl = response.getResult() == null ? "" : response.getResult().toString();

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/MaterialController.java

@@ -195,10 +195,6 @@ public class MaterialController extends WebBaseController {
         materialDTO.setStaffId(login.getClerkId());
         materialDTO.setStaffName(login.getClerkName());
         String materialId = materialDTO.getMaterialId();
-        String msg = this.checkEmoji(materialDTO.getMaterialContent()) ;
-        if(null != msg) {
-          //  return this.fail(msg) ;
-        }
         MaterialDTO dto = materialApiService.selectMaterialById(materialId);
         if (dto == null) {
             return resultResponse(HaoBanErrCode.ERR_2);