From 66cb80c5fcf821b3d210abe1db2a07b35a1f8d64 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 24 Jun 2021 12:21:34 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E4=B8=BB=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/service/panel/PanelSubjectService.java | 7 +++++-- backend/src/main/resources/db/migration/V8__demo.sql | 4 ++-- frontend/src/views/panel/SubjectSetting/index.vue | 10 +++++----- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/panel/PanelSubjectService.java b/backend/src/main/java/io/dataease/service/panel/PanelSubjectService.java index d1385cf178..dc36cc27e6 100644 --- a/backend/src/main/java/io/dataease/service/panel/PanelSubjectService.java +++ b/backend/src/main/java/io/dataease/service/panel/PanelSubjectService.java @@ -41,13 +41,16 @@ public class PanelSubjectService { public List query(PanelSubjectRequest request){ PanelSubjectExample example = new PanelSubjectExample(); - return panelSubjectMapper.selectByExampleWithBLOBs(null); + example.setOrderByClause( "create_time asc"); + return panelSubjectMapper.selectByExampleWithBLOBs(example); } public List querySubjectWithGroup(PanelSubjectRequest request){ List result = new ArrayList(); int pageSize = 4; - List allInfo = panelSubjectMapper.selectByExampleWithBLOBs(null); + PanelSubjectExample example = new PanelSubjectExample(); + example.setOrderByClause( "create_time asc"); + List allInfo = panelSubjectMapper.selectByExampleWithBLOBs(example); for(int i =0;i tmp = allInfo.subList(i,i+pageSize - - - - - + + + + +