Browse Source

Pull request #8891: REPORT-70857 数据集复制后独立

Merge in DESIGN/design from ~YVAN/design:final/11.0 to final/11.0

* commit '92dab998433efcf82fad087b1bae35d0ba43da98':
  REPORT-70857 数据集复制后独立 【问题原因】匹配TableData时,用的equals比较,但是同一个对象equals为false,目前已知的是存储过程TableData,已经跟rinoux沟通 【改动思路】直接换成对象比较 【review建议】无
new-design
Yvan 3 years ago
parent
commit
c4f4e821f4
  1. 3
      designer-base/src/main/java/com/fr/design/data/tabledata/paste/TableDataFollowingPasteUtils.java

3
designer-base/src/main/java/com/fr/design/data/tabledata/paste/TableDataFollowingPasteUtils.java

@ -163,7 +163,8 @@ public class TableDataFollowingPasteUtils {
for (Map.Entry<String, TableDataWrapper> dataWrapperEntry : dataWrapperMap.entrySet()) { for (Map.Entry<String, TableDataWrapper> dataWrapperEntry : dataWrapperMap.entrySet()) {
String tdName = dataWrapperEntry.getKey(); String tdName = dataWrapperEntry.getKey();
TableData td = dataWrapperEntry.getValue().getTableData(); TableData td = dataWrapperEntry.getValue().getTableData();
if (td.equals(tableData)) { // 有些数据集的equals方法有问题,这里直接判断对象地址
if (td == tableData) {
return tdName; return tdName;
} }
} }

Loading…
Cancel
Save