瀏覽代碼

单份复制col字段bug

liuyc 1 年之前
父節點
當前提交
17bd4aad0a

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

@@ -1165,7 +1165,7 @@ public class InformationWriteQueryController extends BladeController {
                                 }
                             }
 
-                            iTaskService.delArchiveFileBusinessData(query.getProjectId(),query.getWbsId());
+                            iTaskService.delArchiveFileBusinessData(query.getProjectId(), query.getWbsId());
                         }
 
                         //更新Redis缓存
@@ -1480,6 +1480,9 @@ public class InformationWriteQueryController extends BladeController {
                     if (nodeOld.getType() == 2 && StringUtils.isNotEmpty(newData.getInitTableName()) && tabOwner.contains(nodeOld.getTableOwner()) && vo.getIsCopyData() == 1) {
                         String tableName = newData.getInitTableName();
                         String col = nodeTabColsMap.get(tableName);
+                        if (ObjectUtil.isEmpty(col)) { //如果没获取到字段,那么跳过
+                            continue;
+                        }
                         List<String> filteredList = Arrays.stream(col.split(","))
                                 .filter(value -> !value.equals("id") && !value.equals("p_key_id") && !value.equals("group_id"))
                                 .collect(Collectors.toList());
@@ -1866,11 +1869,11 @@ public class InformationWriteQueryController extends BladeController {
                             List<String> result = new ArrayList<>();
                             for (String[] a : la) {
                                 String v = a[0];
-                                String sv ;
-                                if(v.contains("、")){
-                                  sv= Arrays.stream(v.split("[、]")).map(e->imitate(e,rjs)).collect(Collectors.joining("、"));
-                                }else{
-                                  sv=imitate(v,rjs);
+                                String sv;
+                                if (v.contains("、")) {
+                                    sv = Arrays.stream(v.split("[、]")).map(e -> imitate(e, rjs)).collect(Collectors.joining("、"));
+                                } else {
+                                    sv = imitate(v, rjs);
                                 }
                                 result.add(sv + "_^_" + a[1]);
                             }
@@ -1884,7 +1887,8 @@ public class InformationWriteQueryController extends BladeController {
         }
         return value;
     }
-    public String imitate(String v,List<RangeJson> rjs){
+
+    public String imitate(String v, List<RangeJson> rjs) {
         RangeJson best = rjs.stream().min(Comparator.comparingDouble(j -> Double.parseDouble(v) - Double.parseDouble(j.getDesign()))).orElse(rjs.get(0));
         int scale = Math.max(new StringBuilder(v).reverse().indexOf("."), 0);
         return BaseUtils.rangeList(1, best.getDesign(), best.getDev(), 1, scale, 1).get(0).toString();