Merge remote-tracking branch 'origin/master'

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

@@ -302,7 +302,8 @@ public class ExcelTabController extends BladeController {
         Worksheet sheet = wb.getWorksheets().get(0);
         sheet.saveToHtml(thmlUrl, options);
 
-        detail.setExtension(bladeFile1.getOriginalName());
+//        detail.setExtension(bladeFile1.getOriginalName());
+        detail.setExtension(file.getOriginalFilename());
         detail.setFileUrl(bladeFile1.getLink());
         detail.setFileType(3); // 表示为清表信息  1 表示祖节点  2 表示为节点信息 3 表示清表
         detail.setHtmlUrl(thmlUrl);
@@ -1737,7 +1738,8 @@ public class ExcelTabController extends BladeController {
         // 上传excel文件
         R<BladeFile> bladeFile = iossClient.addFileInfo(file);
         BladeFile bladeFile1 = bladeFile.getData();
-        detail.setTemplateExtension(bladeFile1.getOriginalName());
+//        detail.setTemplateExtension(bladeFile1.getOriginalName());
+        detail.setTemplateExtension(file.getOriginalFilename());
         detail.setTemplateFileUrl(bladeFile1.getLink());
         excelTabService.saveOrUpdate(detail);
         return R.success("上传成功");

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreePrivateServiceImpl.java

@@ -1622,23 +1622,22 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                             textDictInfoService.saveBatch(list);
                         }
                     }
-
-                    wbsPrivate.setTableOwner(tableInfo.getTableOwner());
-                    wbsPrivate.setInitTableId(tableInfo.getId() + "");
-                    wbsPrivate.setTableType(tableInfo.getTabType());
-                    wbsPrivate.setInitTableName(tableInfo.getTabEnName());
-                    wbsPrivate.setNodeName(tableInfo.getTabChName());
-                    wbsPrivate.setFullName(tableInfo.getTabChName());
-                    wbsPrivate.setFillRate(tableInfo.getFillRate());
-                    wbsPrivate.setProjectId(projectId);
-                    wbsPrivate.setType(10);//带过来的元素信息
-                    wbsPrivate.setParentId(-10L);
-                    wbsPrivate.setStatus(1);
-                    wbsTreePrivateMapper.insert(wbsPrivate);
+                }
+                wbsPrivate.setTableOwner(tableInfo.getTableOwner());
+                wbsPrivate.setInitTableId(tableInfo.getId() + "");
+                wbsPrivate.setTableType(tableInfo.getTabType());
+                wbsPrivate.setInitTableName(tableInfo.getTabEnName());
+                wbsPrivate.setNodeName(tableInfo.getTabChName());
+                wbsPrivate.setFullName(tableInfo.getTabChName());
+                wbsPrivate.setFillRate(tableInfo.getFillRate());
+                wbsPrivate.setProjectId(projectId);
+                wbsPrivate.setType(10);//带过来的元素信息
+                wbsPrivate.setParentId(-10L);
+                wbsPrivate.setStatus(1);
+                wbsTreePrivateMapper.insert(wbsPrivate);
            /* }else{
                 return R.success("没有查到主库信息");
             }*/
-                }
             }
             return R.success("添加成功");
         }