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

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/WbsTreePrivate.java

@@ -269,4 +269,7 @@ public class WbsTreePrivate extends BaseEntity {
 
     @ApiModelProperty(value = "附件类型（复选）")
     private String tableFileType;
+
+    @ApiModelProperty(value = "是否默认隐藏，0：否，1：是")
+    private Integer defaultConceal;
 }

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTreeContractVO6.java

@@ -82,7 +82,12 @@ public class WbsTreeContractVO6 extends WbsTreeContract implements INode<WbsTree
         return true;
     }
 
-    public boolean isMatchLevel(Long level) {
+    public boolean isMatchLevel(Long level1) {
+        //如果选择的是显示层为 18 就设置为1.5去做判断
+        double level = level1 * 1.0;
+        if(level1 == 18){
+            level = 1.5;
+        }
         //对于节点类型为18 做单独处理
         if(this.getNodeType() != null && this.getNodeType().equals(18)){
             if(1.5 > level){

blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java

@@ -2804,9 +2804,12 @@ private Object reviseValue(Map<String, String> p2, String key, Object value) {
                                         if (!objects.isEmpty() && index < objects.size()){
                                             sv = "";
                                             for (String s : v.split("[、]")) {
-                                                sv += objects.get(index) == null ? "" : objects.get(index).toString();
+                                                sv += objects.get(index) == null ? "" : objects.get(index).toString()+"、";
                                                 index++;
                                             }
+                                            if(sv.length()>1){
+                                                sv=sv.substring(0,sv.length()-1);
+                                            }
                                         } else {
                                             sv = Arrays.stream(v.split("[、]")).map(e -> imitate(e, rangeJsons)).collect(Collectors.joining("、"));
                                         }

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

@@ -152,7 +152,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                 List<Long> ids = records.stream().map(ExcelTabVO::getId).collect(Collectors.toList());
                 List<ExcelTabVO> excelTabs = this.baseMapper.getByIds(ids);
                 Map<Long, ExcelTabVO> map = excelTabs.stream().collect(toMap(ExcelTabVO::getId, v -> v));
-                List<ExcelTabVO> projectInfoList  = baseMapper.selectRootExcelTab(new Page<>(), null, ids);
+                List<ExcelTabVO> projectInfoList  = baseMapper.selectRootExcelTab(new Page<>(1,500), null, ids);
                 Map<Long, List<ExcelTabVO>> collect = projectInfoList.stream().collect(Collectors.groupingBy(ExcelTabVO::getId));
                 records.forEach(v -> {
                     ProjectInfoVO1 projectInfoVO1 = new ProjectInfoVO1();
@@ -180,7 +180,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         List<ExcelTabVO> records = baseMapper.selectExcelTabPage(page, excelTab);
         if (!records.isEmpty() && (excelTab.getParentId() == null || excelTab.getParentId() == 0)) {
             Set<Long> set = records.stream().map(ExcelTabVO::getId).collect(Collectors.toSet());
-            List<ExcelTabVO> projectInfoList  = baseMapper.selectRootExcelTab(new Page<>(), null, set);
+            List<ExcelTabVO> projectInfoList  = baseMapper.selectRootExcelTab(new Page<>(1,500), null, set);
             Map<Long, List<ExcelTabVO>> collect = projectInfoList.stream().collect(Collectors.groupingBy(ExcelTabVO::getId));
             records.forEach(v -> {
                 List<ExcelTabVO> excelTabVOS = collect.get(v.getId());
@@ -220,7 +220,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         } else {
             excelTabVO.setExcelUseNumber(Integer.parseInt(map.get("useNum").toString()));
         }
-        List<ExcelTabVO> projectInfoList  = baseMapper.selectRootExcelTab(new Page<>(), null, Collections.singleton(id));
+        List<ExcelTabVO> projectInfoList  = baseMapper.selectRootExcelTab(new Page<>(1,500), null, Collections.singleton(id));
         if (projectInfoList != null && !projectInfoList.isEmpty()) {
             List<ProjectInfoVO1> list = projectInfoList.stream().map(vo -> {
                 ProjectInfoVO1 projectInfoVO1 = new ProjectInfoVO1();

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

@@ -215,9 +215,7 @@ public class ProfilerOffsetServiceImpl extends ServiceImpl<ProfilerOffsetMapper,
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-//    @Scheduled(cron = "0 0 23 ? * FRI")
-    //每周一18：30
-    @Scheduled(cron = "0 30 18 ? * MON")
+    @Scheduled(cron = "0 0 23 ? * FRI")
     public void push() {
         String url = "/data/openapi/v1/push";