Merge branch 'wq1' of SH-Arbitrate/Mediation-Backend into dev

2024-04-30 18:05:34 +08:00
parent 7fb8b20955 3ec845fc46
commit c84ba68599
1 changed files with 4 additions and 2 deletions
@@ -120,13 +120,15 @@ public class MsVideoConferenceController extends BaseController {
                }
            }else {
                // 如果是调解书并且是pdf，则删除之前的在新增
-                if(isMediaBook != null && isMediaBook == 1 && caseId!=null){
+                if(isMediaBook != null && isMediaBook == 1 ){
                    if(StrUtil.isNotEmpty(suffix)&&!suffix.equals("pdf")){
                        return AjaxResult.error("请上传pdf格式文件");
                    }
                    annexType=AnnexTypeEnum.MEDIATE_BOOK_PDF.getCode();
                    // 先删除之前的附件
-                    msCaseAttachMapper.deleteCaseAttachByCasedIdAndType(caseId, annexType);
+                    if(caseId!=null) {
+                        msCaseAttachMapper.deleteCaseAttachByCasedIdAndType(caseId, annexType);
+                    }
                }
                Long annexId = saveCaseAttach(annexType, fileName, file.getOriginalFilename(), caseId);
                // 是否上传到onlyoffice