接口逻辑优化

@@ -37,8 +37,8 @@ public class DgFileController {
 
     @PostMapping("insertDgFile")
     @ApiOperation("新增档案文件信息")
-    public Result insertDgFile(@RequestBody List<AddDgFileRequest> request){
-        if(dgfileService.insertDgFile(request)){
+    public Result insertDgFile(@RequestBody List<AddDgFileRequest> request) {
+        if (dgfileService.insertDgFile(request)) {
             return Result.ok();
         }
         return Result.error("新增失败");
@@ -46,9 +46,9 @@ public class DgFileController {
 
     @DeleteMapping("deleteDgFileByIds")
     @ApiOperation(value = "批量删除档案文件信息和附件")
-    public Result deleteDgFileByIds(@ApiParam("档案文件信息ID列表") @RequestParam(value = "bsmFileList") List<String> bsmFileList) {
+    public Result deleteDgFileByIds(@ApiParam("档案文件信息ID列表") @RequestBody List<String> bsmFileList) {
         try {
-            if(dgfileService.delete(bsmFileList)) {
+            if (dgfileService.delete(bsmFileList)) {
                 return Result.ok("删除成功");
             }
         } catch (Exception e) {
@@ -59,8 +59,8 @@ public class DgFileController {
 
     @PutMapping("updateDgFile")
     @ApiOperation("修改档案文件信息")
-    public Result updateDgFile(@RequestBody UpdateDgFileRequest request){
-        if(dgfileService.updateDgFile(request)) {
+    public Result updateDgFile(@RequestBody UpdateDgFileRequest request) {
+        if (dgfileService.updateDgFile(request)) {
             return Result.ok("修改成功");
         }
         return Result.error("修改失败");
@@ -68,14 +68,14 @@ public class DgFileController {
 
     @GetMapping("getDgFileDetailById")
     @ApiOperation(value = "获取附件列表")
-    public Result<List<DgCatalogWithFileVO>> getDgFileDetailById(@ApiParam("档案标识码") @RequestParam String bsmArchive){
+    public Result<List<DgCatalogWithFileVO>> getDgFileDetailById(@ApiParam("档案标识码") @RequestParam String bsmArchive) {
         return Result.ok(dgfileService.getFileList(bsmArchive));
     }
 
     @PutMapping("updateFileSort")
     @ApiOperation("附件排序")
-    public Result updateFileSort(@RequestBody List<UpdateDgFileRequest> requests){
-        if(dgfileService.updateFileSort(requests)) {
+    public Result updateFileSort(@RequestBody List<UpdateDgFileRequest> requests) {
+        if (dgfileService.updateFileSort(requests)) {
             return Result.ok("修改成功");
         }
         return Result.error("修改失败");
@@ -85,7 +85,7 @@ public class DgFileController {
     @ApiOperation("上传材料附件")
     public Result upload(@RequestPart("file") MultipartFile file, AddDgFileRequest fileRequest) {
         try {
-            return Result.ok(dgfileService.upload(file,fileRequest));
+            return Result.ok(dgfileService.upload(file, fileRequest));
         } catch (Exception e) {
             return Result.exception(e.getMessage());
         }

@@ -137,8 +137,15 @@ public class DgFileServiceImpl extends ServiceImpl<DgFileMapper, DgFileDO> imple
         Integer firstXh = fileRequest.getXh();
         String firstBsmCatalog = fileRequest.getBsmCatalog();
 
-        //文件信息入库
         QueryWrapper<DgFileDO> fileWrapper = new QueryWrapper<>();
+
+        //重新排序
+        fileWrapper.lambda().eq(DgFileDO::getBsmCatalog, firstBsmCatalog).ge(DgFileDO::getXh, firstXh + 1);
+        List<DgFileDO> list = this.list(fileWrapper);
+        list.forEach(item -> item.setXh(item.getXh() + 1));
+        this.updateBatchById(list);
+
+        //文件信息入库
         DgFileDO fileDO = new DgFileDO();
         fileDO.setBsmCatalog(fileRequest.getBsmCatalog());
         fileDO.setFjurl(fileAttribute.getSaveUrl());
@@ -149,12 +156,6 @@ public class DgFileServiceImpl extends ServiceImpl<DgFileMapper, DgFileDO> imple
         fileDO.setXh(firstXh + 1);
         this.save(fileDO);
 
-        //重新排序
-        fileWrapper.lambda().eq(DgFileDO::getBsmCatalog, firstBsmCatalog).gt(DgFileDO::getXh, firstXh + 1);
-        List<DgFileDO> list = this.list(fileWrapper);
-        list.forEach(item -> item.setXh(item.getXh() + 1));
-        this.updateBatchById(list);
-
         List<DgCatalogWithFileVO> fileList = dgfileMapper.getFileList(fileRequest.getBsmArchive());
         fileList.forEach(item->item.getFileLists().forEach(file->file.setSaveUrl(file.getFjurl())));
         fileList.forEach(catalogWithFiles->catalogWithFiles.getFileLists().forEach(file->file.setFjurl(minioUtil.getPreviewUrl(file.getFjurl()))));

@@ -45,7 +45,7 @@
     <select id="getFileList" resultMap="result">
         select DF.*, DAC.XH as catalogXh, DAC.WJMC,DAC.BSM_CATALOG,DA.BSM_ARCHIVES
         from DG_FILE DF
-        join DG_ARCHIVES_CATALOG DAC on DAC.BSM_CATALOG = DF.BSM_CATALOG
+        right join DG_ARCHIVES_CATALOG DAC on DAC.BSM_CATALOG = DF.BSM_CATALOG
         join DG_ARCHIVES DA on DAC.BSM_ARCHIVES = DA.BSM_ARCHIVES
         <where>
             <if test="bsmArchive != null and bsmArchive != ''">