Bläddra i källkod

试验检测获取基础数据不会获取最新的

cr 1 månad sedan
förälder
incheckning
a9c453c331

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

@@ -3190,9 +3190,11 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                 }
             }
         }
-        for (Map.Entry<String, Object> entry : reData1.entrySet()) {
-            if(reData.containsKey(entry.getKey())){
-                reData.put(entry.getKey(), entry.getValue());
+        if(reData1.size()>0){
+            for (Map.Entry<String, Object> entry : reData1.entrySet()) {
+                if(reData.containsKey(entry.getKey())){
+                    reData.put(entry.getKey(), entry.getValue());
+                }
             }
         }
         list.add(reData);