|
@@ -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);
|