From 024c66cf058a630caed0c9f34a365d7f2fde207f Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Mon, 19 Dec 2022 10:01:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/dict/impl/SysDictServiceImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java index e564c07..3369adc 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java @@ -44,12 +44,13 @@ public class SysDictServiceImpl extends ServiceImpl impleme public IPage queryAll(Map whereJson, PageQuery page) { String blurry = null; if (ObjectUtil.isNotEmpty(whereJson.get("blurry"))) blurry = whereJson.get("blurry").toString(); - IPage pages = this.page(new Page<>(page.getPage(), page.getSize()), new QueryWrapper() + IPage pages = this.page(new Page<>(page.getPage() + 1, page.getSize()), new QueryWrapper() .select("MAX(dict_id) AS dictId, code, name") .lambda() .like(ObjectUtil.isNotEmpty(blurry), Dict::getCode, blurry) .or(ObjectUtil.isNotEmpty(blurry)) .like(ObjectUtil.isNotEmpty(blurry), Dict::getName, blurry) + .orderBy(true, true, Dict::getCode) .groupBy(Dict::getCode, Dict::getName)); return pages; } @@ -107,8 +108,11 @@ public class SysDictServiceImpl extends ServiceImpl impleme @Override public IPage queryAllDetail(DictQuery criteria, PageQuery page) { LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); - lam.eq(Dict::getCode, criteria.getCode()).isNotNull(Dict::getLabel).ne(Dict::getLabel, ""); - IPage pages = new Page<>(page.getPage(), page.getSize()); + lam.eq(Dict::getCode, criteria.getCode()) + .isNotNull(Dict::getLabel) + .ne(Dict::getLabel, "") + .orderBy(true, true, Dict::getDictSort); + IPage pages = new Page<>(page.getPage() + 1, page.getSize()); sysDictMapper.selectPage(pages, lam); return pages; }