Merge branch 'dev' of http://219.151.181.73:3000/zhuwei/bladex into dev

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -1737,6 +1737,8 @@ public class ExcelTabController extends BladeController {
             String fileExtension = FileUtil.getFileExtension(bladeFile1.getName()).toLowerCase();
             tableFile.setTabId(pkeyId + "");
             tableFile.setName(file[i].getOriginalFilename());
+            tableFile.setContractId(Long.valueOf(contractId));
+            tableFile.setClassify(Integer.parseInt(classify));
             tableFile.setType(2);
             tableFile.setDomainUrl(bladeFile1.getLink());
             tableFile.setIsDeleted(0);
@@ -4616,6 +4618,7 @@ public class ExcelTabController extends BladeController {
     @PostMapping("/add-bussfile-node-sort")
     public R addBussFileNodeSort(@RequestBody AddBussFileSortDTO dto){
         List<TableFile> tableFileList = tableFileService.list(new LambdaQueryWrapper<>(TableFile.class).eq(TableFile::getClassify, dto.getClassify()).eq(TableFile::getContractId, dto.getContractId()).eq(TableFile::getTabId, dto.getId()).eq(TableFile::getType, dto.getType()));
+        System.out.println(tableFileList);
         if(dto.getList().length>0&&!tableFileList.isEmpty()){
             for (TableFile file : tableFileList) {
                 for (int i = 0; i < dto.getList().length; i++) {