|
@@ -3066,6 +3066,10 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
|
|
|
for (String data : mysql) {
|
|
|
String[] tabData = data.split("_\\^_");
|
|
|
if (StringUtils.isNotEmpty(tabData[0])) {
|
|
|
+ Object o = reData.get(key + "__" + tabData[1]);
|
|
|
+ if (o != null && tabData[0].equals("/")) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
reData.put(key + "__" + tabData[1], tabData[0]);
|
|
|
}
|
|
|
}
|