From 74d9244b1ebd296e18a060dba50629ad844653df Mon Sep 17 00:00:00 2001 From: "Leo.Qin" Date: Tue, 28 Mar 2023 14:43:37 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-83689=20=E5=8D=95=E5=85=83=E6=A0=BC?= =?UTF-8?q?=E4=B8=BA=E5=AD=98=E5=82=A8=E8=BF=87=E7=A8=8B=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=88=97=E7=9A=84=E6=97=B6=E5=80=99=E6=97=A0=E6=B3=95=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E6=95=B0=E6=8D=AE=E9=9B=86=E6=8E=92=E5=88=97=20?= =?UTF-8?q?=E3=80=90=E9=97=AE=E9=A2=98=E5=8E=9F=E5=9B=A0=E3=80=91=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E6=95=B0=E6=8D=AE=E9=9B=86=E6=8E=92=E5=88=97=EF=BC=8C?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=BD=93=E5=89=8D=E6=A8=A1=E7=89=88=E6=89=80?= =?UTF-8?q?=E6=9C=89=E6=95=B0=E6=8D=AE=E9=9B=86=E6=97=B6=EF=BC=8C=E6=9C=AA?= =?UTF-8?q?=E8=80=83=E8=99=91=E5=AD=98=E5=82=A8=E8=BF=87=E7=A8=8B=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86=EF=BC=8C=E5=AF=BC=E8=87=B4=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=9A=84tableDataWrapper=E4=B8=BA=E7=A9=BA=20=E3=80=90?= =?UTF-8?q?=E6=94=B9=E5=8A=A8=E6=80=9D=E8=B7=AF=E3=80=91=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=89=80=E6=9C=89=E6=95=B0=E6=8D=AE=E9=9B=86=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=8C=85=E6=8B=AC=E5=AD=98=E5=82=A8=E8=BF=87=E7=A8=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/sort/celldscolumn/CellDSColumnSortGroupPane.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/design/sort/celldscolumn/CellDSColumnSortGroupPane.java b/designer-realize/src/main/java/com/fr/design/sort/celldscolumn/CellDSColumnSortGroupPane.java index 788f1a57cb..01c5eafc05 100644 --- a/designer-realize/src/main/java/com/fr/design/sort/celldscolumn/CellDSColumnSortGroupPane.java +++ b/designer-realize/src/main/java/com/fr/design/sort/celldscolumn/CellDSColumnSortGroupPane.java @@ -8,6 +8,8 @@ import com.fr.design.sort.common.AbstractSortItemPane; import com.fr.report.cell.cellattr.core.group.DSColumn; import com.fr.report.core.sort.sortexpression.SortExpression; +import java.util.Map; + public class CellDSColumnSortGroupPane extends AbstractSortGroupPane { DSColumn dsColumn; @@ -24,7 +26,8 @@ public class CellDSColumnSortGroupPane extends AbstractSortGroupPane { CellDSColumnSortItemPane cellDSColumnSortItemPane = new CellDSColumnSortItemPane(sortItemPaneWidth, sortItemPaneRightWidth); java.util.Map tableDataWrapperMap = DesignTableDataManager.getAllEditingDataSet(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getTarget()); - TableDataWrapper tableDataWrapper = tableDataWrapperMap.get(dsColumn.getDSName()); + Map allDataSetIncludingProcedure = DesignTableDataManager.getAllDataSetIncludingProcedure(tableDataWrapperMap); + TableDataWrapper tableDataWrapper = allDataSetIncludingProcedure.get(dsColumn.getDSName()); if (tableDataWrapper != null) { java.util.List columnNameList = tableDataWrapper.calculateColumnNameList(); String[] columnNames = new String[columnNameList.size()];