169952a3 by 荆蔚杰

档案修改查询列表数据去重.

档案补录新增上传文件时判断是否有卷内目录
1 parent 9107f7e9
...@@ -79,7 +79,7 @@ public class DgFileController { ...@@ -79,7 +79,7 @@ public class DgFileController {
79 @RequestMapping(value = "/upload", method = RequestMethod.POST) 79 @RequestMapping(value = "/upload", method = RequestMethod.POST)
80 @ApiOperation("上传材料附件") 80 @ApiOperation("上传材料附件")
81 public Result upload(@RequestPart("file") MultipartFile file, AddDgFileRequest fileRequest) { 81 public Result upload(@RequestPart("file") MultipartFile file, AddDgFileRequest fileRequest) {
82 if (StrUtil.isNullOrUndefined(fileRequest.getBsmArchive()) && StrUtil.isNullOrUndefined(fileRequest.getBsmCatalog())) { 82 if (StrUtil.isEmpty(fileRequest.getBsmArchive()) || StrUtil.isEmpty(fileRequest.getBsmCatalog())) {
83 return Result.error("请先新增档案基本信息和目录"); 83 return Result.error("请先新增档案基本信息和目录");
84 } 84 }
85 try { 85 try {
......