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

blade-service/blade-manager/src/main/java/com/mixsmart/utils/CustomFunction.java

@@ -1731,11 +1731,11 @@ public class CustomFunction {
                 for (Integer i : index) {
                     boolean isExist = false;
                     //获取当前节点的名称
-                    String title = map.get(i == 0 ? 1 : i == 18 ? 1 : i);
+                    String title = map.get(i == 0 ? 1 : i == 1 && map.containsKey(18) ? 18 : i);
                     //当前节点的名称是否已经在父级节点中包含了
                     if(org.apache.commons.lang.StringUtils.isNotEmpty(title)){
                         for (int j = 0; j < i; j++) {
-                            String parentTitle = map.get(j == 0 ? 1 : j == 18 ? 1 : j);
+                            String parentTitle = map.get(j == 0 ? 1 : j == 1 && map.containsKey(18) ? 18 : j);
                             //如果父级节点名称中保存当前节点名称  就跳过当前节点
                             if(org.apache.commons.lang.StringUtils.isNotEmpty(parentTitle) && org.apache.commons.lang.StringUtils.isNotEmpty(title) && parentTitle.contains(title)){
                                 isExist = true;

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

@@ -203,11 +203,11 @@ public class NodeBaseInfoController extends BladeController {
             for (Integer i : index) {
                 boolean isExist = false;
                 //获取当前节点的名称
-                String title = map.get(i == 0 ? 1 : i == 18 ? 1 : i);
+                String title = map.get(i == 0 ? 1 : i == 1 && map.containsKey(18) ? 18 : i);
                 //当前节点的名称是否已经在父级节点中包含了
                 if(StringUtils.isNotEmpty(title)){
                     for (int j = 0; j < i; j++) {
-                        String parentTitle = map.get(j == 0 ? 1 : j == 18 ? 1 : j);
+                        String parentTitle = map.get(j == 0 ? 1 : j == 1 && map.containsKey(18) ? 18 : j);
                         //如果父级节点名称中保存当前节点名称  就跳过当前节点
                         if(StringUtils.isNotEmpty(parentTitle) && StringUtils.isNotEmpty(title) && parentTitle.contains(title)){
                             isExist = true;

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

@@ -5243,16 +5243,6 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
     /*表id,项目id,节点Id*/
     public List<KeyMapper> listForContract(List<Long> ids, String projectId, String nodeId, String testGroupId) {
         List<Map<String, Object>> listMap = listMap(ids, ExecuteType.INSPECTION);
-        //质检这个参数为0，表示过滤公式，为1，表示html渲染表格
-        if (!"1".equals(testGroupId)) {
-            //根据节点id查询 合同段扩展表
-            WbsTreeContractExtend byId = wbsTreeContractExtendService.getById(nodeId);
-            if (byId != null && StringUtils.isNotEmpty(byId.getFormulaConfig())) {
-                List<String> list = Arrays.asList(byId.getFormulaConfig().split(","));
-                listMap = listMap.stream().filter(m -> !list.contains(m.get("tableName").toString() + ":" + m.get("field").toString())).collect(Collectors.toList());
-            }
-        }
-
         WbsTreePrivate wtp = wtpId(Long.parseLong(nodeId));
         if (Func.isNotEmpty(listMap)) {
             /*当前节点的某个元素存在多种作用域的公式，作用域范围越小优先级越高*/
@@ -5340,14 +5330,6 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
     private List<KeyMapper> listForPrivate(List<Long> ids, String projectId, String nodeId, String testGroupId) {
         /**/
         List<Map<String, Object>> listMap = listMap(ids, ExecuteType.TESTING);
-        if (StringUtil.isNotBlank(testGroupId)) {
-            //根据节点id查询 合同段扩展表
-            WbsTreeContractExtend byId = wbsTreeContractExtendService.getById(testGroupId);
-            if (byId != null && StringUtils.isNotEmpty(byId.getFormulaConfig())) {
-                List<String> list = Arrays.asList(byId.getFormulaConfig().split(","));
-                listMap = listMap.stream().filter(m -> !list.contains(m.get("tableName").toString() + ":" + m.get("field").toString())).collect(Collectors.toList());
-            }
-        }
         List<KeyMapper> list = listMap.stream().map(m -> BeanUtil.toBean(m, KeyMapper.class)).collect(Collectors.toList());
         if (Func.isNotEmpty(listMap)) {
             WbsTreePrivate wtp = this.wbsTreePrivateMapper.selectOne(Wrappers.<WbsTreePrivate>lambdaQuery().eq(WbsTreePrivate::getPKeyId, nodeId));