Эх сурвалжийг харах

试验-规范管理-规范文件批量编辑 空值判断

LHB 2 сар өмнө
parent
commit
5085062d1a

+ 2 - 2
blade-service/blade-business/src/main/java/org/springblade/business/controller/PrivateStandardController.java

@@ -147,8 +147,8 @@ public class PrivateStandardController {
     @PostMapping("updateTypeByTwo")
     @ApiOperation(value = "规范文件修改数据")
     public R<Boolean> updateTypeByTwo(@RequestPart("data") @Validated List<PrivateStandardDTO> data,
-                             @RequestPart("delIds") @Validated List<Long> delIds,
-                             @RequestPart("delFileIds") @Validated List<Long> delFileIds,
+                             @RequestPart("delIds")  List<Long> delIds,
+                             @RequestPart("delFileIds") List<Long> delFileIds,
                              @RequestPart("files") MultipartFile[] files) {
         //封装数据
         boolean save = this.privateStandardService.updateTypeByTwo(data,delIds,delFileIds,files);

+ 7 - 4
blade-service/blade-business/src/main/java/org/springblade/business/service/impl/PrivateStandardServiceImpl.java

@@ -200,10 +200,12 @@ public class PrivateStandardServiceImpl extends ServiceImpl<PrivateStandardMappe
         BladeUser user = SecureUtil.getUser();
         //先删除文件
         try {
-            List<StandardFile> standardFiles = standardFileService.listByIds(delFileIds);
-            if(CollectionUtils.isNotEmpty(standardFiles)){
-                for (StandardFile standardFile : standardFiles) {
-                    this.deleteFile(standardFile.getId());
+            if(CollectionUtils.isNotEmpty(delFileIds)){
+                List<StandardFile> standardFiles = standardFileService.listByIds(delFileIds);
+                if(CollectionUtils.isNotEmpty(standardFiles)){
+                    for (StandardFile standardFile : standardFiles) {
+                        this.deleteFile(standardFile.getId());
+                    }
                 }
             }
             //删除规范文件
@@ -213,6 +215,7 @@ public class PrivateStandardServiceImpl extends ServiceImpl<PrivateStandardMappe
                 }
             }
         } catch (Exception e) {
+            e.printStackTrace();
             throw new ServiceException("Oss删除文件失败");
         }
         try {