Browse Source

Pull request #3594: REPORT-46723 填报智能添加单元格组 遗漏一个判断条件的同步修改

Merge in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0

* commit '39f024e13eb7e8211ec71f40b39858c169becbbc':
  REPORT-46723 填报智能添加单元格组 遗漏一个判断条件的同步修改
bugfix/10.0
Hades 4 years ago
parent
commit
5fb611fb8b
  1. 7
      designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java

7
designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java

@ -460,10 +460,11 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
TemplateCellElement cellElement = ePane.getEditingElementCase().getTemplateCellElement(c + i, r + j); TemplateCellElement cellElement = ePane.getEditingElementCase().getTemplateCellElement(c + i, r + j);
if (cellElement != null && ((i + c) != 0 || (r + j) != 0)) { if (cellElement != null && ((i + c) != 0 || (r + j) != 0)) {
String value = cellElement.toString(); String value = cellElement.toString();
if (!newAdd.contains(value) && !allColumnRow.contains(value)) { ColumnRow columnRow = ColumnRow.valueOf(value);
add.addColumnRow(ColumnRow.valueOf(value)); if (!newAdd.contains(columnRow) && !allColumnRow.contains(value)) {
add.addColumnRow(columnRow);
} }
newAdd.add(ColumnRow.valueOf(value)); newAdd.add(columnRow);
} }
if (cellElement == null) { if (cellElement == null) {

Loading…
Cancel
Save