2 Commits 29c40b166b ... 7d36071c96

Author SHA1 Message Date
  chenr 7d36071c96 Merge remote-tracking branch 'origin/master' 1 month ago
  chenr bbb6084a7a 杭宁接口 1 month ago

+ 10 - 0
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeContractServiceImpl.java

@@ -1461,6 +1461,15 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                                 keys.add(key);
                                 keys.add(key);
                                 String data = vo.getData();
                                 String data = vo.getData();
                                 values.add(data);
                                 values.add(data);
+                            }else{
+                                String[] array = tabData.stream().filter(o -> o.getKey().equals(key)).map(o -> o.getData()).toArray(String[]::new);
+                                String data=String.join("☆",array);
+                                for (int i = 0; i < values.size(); i++) {
+                                    if(data.contains(values.get(i))){
+                                        values.set(i,data);
+                                        break;
+                                    }
+                                }
                             }
                             }
                             if (ObjectUtil.isNotEmpty(vo.getDataLength()) && vo.getDataLength() > 250 && vo.getDataLength() <= 500) {
                             if (ObjectUtil.isNotEmpty(vo.getDataLength()) && vo.getDataLength() > 250 && vo.getDataLength() <= 500) {
                                 Integer length = keyLengthMaps.get(vo.getKey());
                                 Integer length = keyLengthMaps.get(vo.getKey());
@@ -1665,6 +1674,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                                     if (!placeholderValue.contains("警告") && StringUtils.isNotEmpty(placeholderValue)) {
                                     if (!placeholderValue.contains("警告") && StringUtils.isNotEmpty(placeholderValue)) {
                                         if (StringUtils.isNotEmpty(htmlStringJL)) {
                                         if (StringUtils.isNotEmpty(htmlStringJL)) {
                                             Document docJL = Jsoup.parse(htmlStringJL);
                                             Document docJL = Jsoup.parse(htmlStringJL);
+                                            System.out.println("el-input[placeholderxx~=" + this.escapeRegex(placeholderValue) + ".*]");
                                             Elements tdJL = docJL.select("el-input[placeholderxx~=" + this.escapeRegex(placeholderValue) + ".*]");
                                             Elements tdJL = docJL.select("el-input[placeholderxx~=" + this.escapeRegex(placeholderValue) + ".*]");
 
 
                                             //特殊处理
                                             //特殊处理