Merge branch 'test-merge' of http://219.151.181.73:3000/zhuwei/bladex into test-merge

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

@@ -42,6 +42,7 @@ import org.springblade.manager.entity.WbsTreePrivate;
 import org.springblade.manager.service.IExcelTabService;
 import org.springblade.manager.service.IWbsTreeContractService;
 import org.springblade.manager.service.IWbsTreePrivateService;
+import org.springblade.manager.vo.AppWbsTreeContractVO;
 import org.springblade.manager.vo.ExcelTabVO;
 import org.springblade.resource.feign.NewIOSSClient;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -288,11 +289,17 @@ public class TableFileController extends BladeController {
     @PostMapping("/sort")
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "附件排序", notes = "传入listids")
-    public R sort(@RequestBody List<TableFile> list){
-        int i=1;
-        for (TableFile file : list) {
-            file.setSort(i++);
+    public R sort(@RequestBody List<AppWbsTreeContractVO> fileList){
+        for (AppWbsTreeContractVO vo : fileList) {
+            List<TableFile> list = vo.getFileList();
+            if(!list.isEmpty()){
+                int i=1;
+                for (TableFile file : list) {
+                    file.setSort(i++);
+                }
+            }
+            tableFileService.updateBatchById(list);
         }
-      return R.status(tableFileService.updateBatchById(list));
+      return R.status(true);
     }
 }

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

@@ -519,6 +519,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                     Set<WbsTreePrivate> resultNodes = new HashSet<>();
                     List<WbsTreePrivate> wbsTreePrivates = wbsTreePrivateMapper.selectList(Wrappers.<WbsTreePrivate>lambdaQuery().eq(WbsTreePrivate::getType, 1).eq(WbsTreePrivate::getWbsId, wbsId).eq(WbsTreePrivate::getProjectId, projectId).and(wrapper -> wrapper.like(WbsTreePrivate::getNodeName, queryValue).or().like(WbsTreePrivate::getImportMatchingInfo, queryValue)).and(wrapper -> wrapper.ne(WbsTreePrivate::getIsAddConceal, 1).or().isNull(WbsTreePrivate::getIsAddConceal)));
                     this.getParentNodesPrivateWbs(wbsTreePrivates, resultNodes, projectId, wbsId);
+                    this.getChildNodesPrivateWbs(wbsTreePrivates, resultNodes, projectId, wbsId);
                     resultNodes.addAll(wbsTreePrivates);
                     List<WbsTreePrivateQueryValueVO> wbsTreePrivateQueryValueVOS = BeanUtil.copyProperties(resultNodes, WbsTreePrivateQueryValueVO.class);
                     if (wbsTreePrivateQueryValueVOS.size() > 0) {
@@ -798,6 +799,17 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         }
     }
 
+    private void getChildNodesPrivateWbs(List<WbsTreePrivate> wbsTreePrivates, Set<WbsTreePrivate> resultNodes, String projectId, String wbsId) {
+        Set<Long> Ids = wbsTreePrivates.stream().map(WbsTreePrivate::getId).collect(Collectors.toSet());
+        if (Ids.size() > 0) {
+            List<WbsTreePrivate> childNodes = wbsTreePrivateMapper.selectList(Wrappers.<WbsTreePrivate>lambdaQuery().in(WbsTreePrivate::getParentId, Ids).eq(WbsTreePrivate::getType, 1).eq(WbsTreePrivate::getWbsId, wbsId).eq(WbsTreePrivate::getProjectId, projectId));
+            if (childNodes.size() > 0) {
+                resultNodes.addAll(childNodes);
+                this.getChildNodesPrivateWbs(childNodes, resultNodes, projectId, wbsId);
+            }
+        }
+    }
+
     private void buildWbsTreePrivateByGetQueryValueByType(List<WbsTreePrivateQueryValueVO> listRoot, Map<Long, List<WbsTreePrivateQueryValueVO>> mapAll) {
         for (WbsTreePrivateQueryValueVO wbsTree : listRoot) {
             List<WbsTreePrivateQueryValueVO> childrenList = mapAll.get(wbsTree.getId());