后端隐藏 默认隐藏

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

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

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

@@ -4398,10 +4398,10 @@ public R<Boolean> saveContractTreeNode(@RequestBody AddContractTreeNodeVO vo) {
                     newData.setIsTypePrivatePid(half.getPKeyId());
                 //}
                 //2025年12月05日10：18更改需求，需要与项目级一致
-//                if (half.getType() != null && new Integer("2").equals(half.getType())) {
-//                    //2023年8月1日14:41:03更改需求，isBussShow默认=1
-//                    newData.setIsBussShow(half.getDefaultConceal() + 1);
-//                }
+                if (half.getType() != null && new Integer("2").equals(half.getType())) {
+                    //2023年8月1日14:41:03更改需求，isBussShow默认=1
+                    newData.setIsBussShow(half.getIsBussShow());
+                }
 
                 //获取当前所有复制的节点的最大sort
                 newData.setSort(ObjectUtils.isNotEmpty(half.getSort()) ? half.getSort() : 0);
@@ -4822,7 +4822,7 @@ private void foreachQueryChild(List<Long> parentIdsList, List<WbsTreePrivateAddV
         " and project_id = " + wbsTreeContract.getProjectId() +
         " and wbs_id = " + wbsTreeContract.getWbsId() +
         " and wbs_type = " + wbsTreeContract.getWbsType() +
-        " and is_deleted = 0 and status = 1";
+        " and is_deleted = 0 ";
     List<WbsTreePrivateAddVO> childS = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(WbsTreePrivateAddVO.class));
     if (childS.size() > 0) {
         childList.addAll(childS);

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

@@ -413,13 +413,7 @@ public class InformationImportRecordController extends BladeController {
             newData.setCreateTime(new Date());
             newData.setIsTypePrivatePid(half.getPKeyId());
             if (half.getType() != null && new Integer("2").equals(half.getType())) {
-                if (half.getDefaultConceal() != null &&  half.getDefaultConceal() == 1) {
-                    // 后续如果此表格中有数据再修改成 1
-                    newData.setIsBussShow(2);
-                } else {
-                    //2023年8月1日14:41:03更改需求，isBussShow默认=1
-                    newData.setIsBussShow(1);
-                }
+                newData.setIsBussShow(half.getIsBussShow());
             }
             //获取当前所有复制的节点的最大sort
             newData.setSort(ObjectUtils.isNotEmpty(half.getSort()) ? half.getSort() : 0);

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

@@ -661,7 +661,7 @@ public class WbsTreePrivateController extends BladeController {
     }
 
     /**
-     * 隐藏/启用表单
+     * 隐藏/启用表单 隐藏后的表单客户端是看不到的
      */
     @ApiOperationSupport(order = 11)
     @ApiOperation(value = "隐藏/启用表单", notes = "传入pKeyId")
@@ -1299,7 +1299,7 @@ public class WbsTreePrivateController extends BladeController {
 
 
     /**
-     * 设置/取消 表单默认隐藏
+     * 设置/取消 表单默认隐藏 隐藏后的表单客户端是可以看到，但是为灰色状态
      */
     @GetMapping("/showTable")
     @ApiOperationSupport(order = 41)
@@ -1310,18 +1310,20 @@ public class WbsTreePrivateController extends BladeController {
         if (pKeyId == null) {
             return R.fail("参数错误");
         }
-        WbsTreePrivate wbsTreePrivate = wbsTreePrivateMapper.selectOne(Wrappers.<WbsTreePrivate>lambdaQuery().select(WbsTreePrivate::getPKeyId, WbsTreePrivate::getDefaultConceal, WbsTreePrivate::getProjectId)
+        WbsTreePrivate wbsTreePrivate = wbsTreePrivateMapper.selectOne(Wrappers.<WbsTreePrivate>lambdaQuery().select(WbsTreePrivate::getPKeyId, WbsTreePrivate::getIsBussShow, WbsTreePrivate::getProjectId)
                 .eq(WbsTreePrivate::getPKeyId, pKeyId).ne(WbsTreePrivate::getType, 1));
         if (wbsTreePrivate == null) {
             return R.fail("选择的表单不存在");
         }
-        int isDefaultConceal = 0;
-        if (wbsTreePrivate.getDefaultConceal() == null || wbsTreePrivate.getDefaultConceal() == 0) {
-            isDefaultConceal = 1;
+        int isBUssShow;
+        if(wbsTreePrivate.getIsBussShow()==null||wbsTreePrivate.getIsBussShow()==1||wbsTreePrivate.getIsBussShow()==0){
+            isBUssShow=2;
+        }else {
+            isBUssShow=1;
         }
-        boolean update = wbsTreePrivateService.update(Wrappers.<WbsTreePrivate>lambdaUpdate().eq(WbsTreePrivate::getPKeyId, pKeyId).set(WbsTreePrivate::getDefaultConceal, isDefaultConceal).set(WbsTreePrivate::getIsBussShow, isDefaultConceal + 1));
+        boolean update = wbsTreePrivateService.update(Wrappers.<WbsTreePrivate>lambdaUpdate().eq(WbsTreePrivate::getPKeyId, pKeyId).set(WbsTreePrivate::getIsBussShow, isBUssShow));
         if ( update) {
-            jdbcTemplate.execute("update m_wbs_tree_contract set is_buss_show =  " + (isDefaultConceal + 1) + " where is_deleted = 0 and is_type_private_pid = " + pKeyId + " and project_id = " + wbsTreePrivate.getProjectId());
+            jdbcTemplate.execute("update m_wbs_tree_contract set is_buss_show =  " + isBUssShow + " where is_deleted = 0 and is_type_private_pid = " + pKeyId + " and project_id = " + wbsTreePrivate.getProjectId());
         }
         return R.data(update);
     }

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

@@ -341,6 +341,10 @@ public class WbsSynchronousServiceImpl {
                 //新增数据二次筛选  只保留任务选中的表单   但可能新增的数据包含新节点
                 if (CollectionUtil.isNotEmpty(formList)) {
                     addPrivateNodes = addPrivateNodes.stream().filter(f -> f.getType() == 1 || formList.contains(f.getPKeyId())).collect(Collectors.toList());
+                    //新增表单时
+                    addPrivateNodes.forEach(f->{
+                        f.setIsBussShow(f.getIsBussShow());
+                    });
                 }
 
                 //筛选出需要更新的节点  同时做数据隔离
@@ -444,9 +448,7 @@ public class WbsSynchronousServiceImpl {
                                 editPrivateNode.setInitTableName(templateNode.getInitTableName());
                                 //绑定隐藏信息
                                 editPrivateNode.setStatus(templateNode.getStatus());
-                                //合同段是根据这个字段隐藏的
                                 editPrivateNode.setIsBussShow(templateNode.getIsBussShow());
-
                                 if (StringUtil.isBlank(templateNode.getHtmlUrl())) {
                                     throw new ServiceException(templateNode.getNodeName() + "( " + templateNode.getPKeyId() + ")HTML文件不存在");
                                 }
@@ -826,7 +828,12 @@ public class WbsSynchronousServiceImpl {
                     //合同段新增节点
                     List<WbsTreeContract> addContractNode = null;
                     if (addPrivateNodes != null && (CollectionUtil.isEmpty(collect) || collect.contains(1))) {
-                        addContractNode = BeanUtil.copyProperties(addPrivateNodes, WbsTreeContract.class);
+                        addContractNode = new ArrayList<>();
+                        for (WbsTreePrivate addPrivateNode : addPrivateNodes) {
+                            WbsTreeContract wbsTreeContract1 = BeanUtil.copyProperties(addPrivateNode, WbsTreeContract.class);
+                            wbsTreeContract1.setIsBussShow(addPrivateNode.getIsBussShow());
+                            addContractNode.add(wbsTreeContract1);
+                        }
                     }
 
                     if (CollectionUtil.isNotEmpty(addContractNode)) {