修复了一些BUG

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

@@ -10,6 +10,7 @@ import org.springblade.core.cache.utils.CacheUtil;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.manager.dto.ArchiveTreeDTO;
@@ -108,13 +109,12 @@ public class ArchiveTreeController extends BladeController {
      */
     @GetMapping("/lazy-tree")
     @ApiOperationSupport(order = 6)
-    @ApiOperation(value = "懒加载树形结构", notes = "传入父级id，租户id，token")
+    @ApiOperation(value = "懒加载树形结构", notes = "传入父级id")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "parentId", value = "父级id", required = true),
-            @ApiImplicitParam(name = "token", value = "token", required = true)
+            @ApiImplicitParam(name = "parentId", value = "父级id", required = true)
     })
-    public R<List<ArchiveTreeVO>> lazyTree(Long parentId, BladeUser bladeUser) {
-        List<ArchiveTreeVO> tree = archiveTreeService.lazyTree(bladeUser.getTenantId(), parentId);
+    public R<List<ArchiveTreeVO>> lazyTree(Long parentId) {
+        List<ArchiveTreeVO> tree = archiveTreeService.lazyTree(AuthUtil.getTenantId(), parentId);
         if (tree != null && tree.size() > 0) {
             return R.data(tree);
         }
@@ -126,14 +126,13 @@ public class ArchiveTreeController extends BladeController {
      */
     @GetMapping("/tree")
     @ApiOperationSupport(order = 7)
-    @ApiOperation(value = "全加载树形结构/显示树", notes = "token、或disPlayTree=1加载显示树、nodeType")
+    @ApiOperation(value = "全加载树形结构/显示树", notes = "disPlayTree、nodeType")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "token", value = "token", required = true),
             @ApiImplicitParam(name = "disPlayTree", value = "是否加载显示树 'null'=不加载 '1'=加载"),
             @ApiImplicitParam(name = "nodeType", value = "'null'=全加载 '1'=关联电子原生文件类型树 '2'=文件上传类型树")
     })
-    public R<List<ArchiveTreeVO>> tree(BladeUser bladeUser, Integer disPlayTree, Integer nodeType) {
-        List<ArchiveTreeVO> tree = archiveTreeService.tree(bladeUser.getTenantId(), disPlayTree, nodeType);
+    public R<List<ArchiveTreeVO>> tree(Integer disPlayTree, Integer nodeType) {
+        List<ArchiveTreeVO> tree = archiveTreeService.tree(AuthUtil.getTenantId(), disPlayTree, nodeType);
         if (tree != null && tree.size() > 0) {
             return R.data(tree);
         }

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

@@ -214,17 +214,6 @@ public class WbsFormElementController extends BladeController {
     }
 
 
-    /**
-     * 根据元素码获取元素详情
-     */
-    /*@ApiOperationSupport(order = 9)
-    @ApiOperation(value = "根据元素码获取元素详情", notes = "fId、tableElementKey")
-    @RequestMapping(value = "/searchElementDetailByCondition", method = RequestMethod.GET)
-    public R<WbsFormElement> searchElementDetailByCondition(String fId, String tableElementKey) {
-        WbsFormElement detail = wbsFormElementService.searchElementDetailByTableElementKey(fId, tableElementKey);
-        return R.data(detail);
-    }*/
-
     /**
      * 提交清表关联公有Wbs树并创建元素
      */

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

@@ -17,7 +17,6 @@
 package org.springblade.manager.controller;
 
 
-
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import io.swagger.annotations.*;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -353,11 +352,11 @@ public class WbsTreeController extends BladeController {
     @ApiOperationSupport(order = 17)
     @ApiOperation(value = "Wbs公有树节点批量导入元素表与元素", notes = "传入excel文件/wbsTree对象")
     @RequestMapping(value = "/import-wbsTreeFormBatch", method = RequestMethod.POST)
-    public R importWbsTreeTableAndForm(@RequestPart("excelFile") MultipartFile excelFile,
-                                       @RequestPart("wbsId") String wbsId,
-                                       @RequestPart("ancestors") String ancestors,
-                                       @RequestPart("id") String id,
-                                       @RequestPart("tenantId") String tenantId) {
+    public R importWbsTreeTableAndForm(@RequestParam("excelFile") MultipartFile excelFile,
+                                       @RequestParam("wbsId") String wbsId,
+                                       @RequestParam("ancestors") String ancestors,
+                                       @RequestParam("id") String id,
+                                       @RequestParam("tenantId") String tenantId) {
         WbsTree wbsTree = new WbsTree();
         wbsTree.setWbsId(wbsId);
         wbsTree.setId(Long.valueOf(id));

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

@@ -542,7 +542,6 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         List<String> idList = Arrays.asList(ids);
         List<String> idList1 = idList.stream().filter(string -> !string.isEmpty()).collect(Collectors.toList());
         List<String> idList2 = new ArrayList<>();
-        int deletedStatus = 0;
         //当前公有引用
         if (pawDTO.getReferenceType().equals("public")) {
             List<WbsTreePrivate> wbsTreePrivates = wbsTreePrivateMapper.selectList(Wrappers.<WbsTreePrivate>query().lambda()
@@ -564,7 +563,6 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
             wbsTreePrivates2.stream().forEach(wbsTreePrivate -> {
                 idList2.add(String.valueOf(wbsTreePrivate.getId()));
             });
-            deletedStatus = 1;
         }
         List<String> diffRent = WbsTreeContractServiceImpl.getDiffrent(idList1, idList2);
         //元素表同步