root/nl-sso-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码修改

Browse Source
This commit is contained in:
liyongde
2022-12-19 10:01:23 +08:00
parent b95befb91b
commit 024c66cf05
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java
View File

@@ -44,12 +44,13 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, Dict> impleme
public IPage<Dict> queryAll(Map whereJson, PageQuery page) { public IPage<Dict> queryAll(Map whereJson, PageQuery page) {
String blurry = null; String blurry = null;
if (ObjectUtil.isNotEmpty(whereJson.get("blurry"))) blurry = whereJson.get("blurry").toString(); if (ObjectUtil.isNotEmpty(whereJson.get("blurry"))) blurry = whereJson.get("blurry").toString();
IPage<Dict> pages = this.page(new Page<>(page.getPage(), page.getSize()), new QueryWrapper<Dict>() IPage<Dict> pages = this.page(new Page<>(page.getPage() + 1, page.getSize()), new QueryWrapper<Dict>()
.select("MAX(dict_id) AS dictId, code, name") .select("MAX(dict_id) AS dictId, code, name")
.lambda() .lambda()
.like(ObjectUtil.isNotEmpty(blurry), Dict::getCode, blurry) .like(ObjectUtil.isNotEmpty(blurry), Dict::getCode, blurry)
.or(ObjectUtil.isNotEmpty(blurry)) .or(ObjectUtil.isNotEmpty(blurry))
.like(ObjectUtil.isNotEmpty(blurry), Dict::getName, blurry) .like(ObjectUtil.isNotEmpty(blurry), Dict::getName, blurry)
.orderBy(true, true, Dict::getCode)
.groupBy(Dict::getCode, Dict::getName)); .groupBy(Dict::getCode, Dict::getName));
return pages; return pages;
} }
@@ -107,8 +108,11 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, Dict> impleme
@Override @Override
public IPage<Dict> queryAllDetail(DictQuery criteria, PageQuery page) { public IPage<Dict> queryAllDetail(DictQuery criteria, PageQuery page) {
LambdaQueryWrapper<Dict> lam = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Dict> lam = new LambdaQueryWrapper<>();
lam.eq(Dict::getCode, criteria.getCode()).isNotNull(Dict::getLabel).ne(Dict::getLabel, ""); lam.eq(Dict::getCode, criteria.getCode())
IPage<Dict> pages = new Page<>(page.getPage(), page.getSize()); .isNotNull(Dict::getLabel)
.ne(Dict::getLabel, "")
.orderBy(true, true, Dict::getDictSort);
IPage<Dict> pages = new Page<>(page.getPage() + 1, page.getSize());
sysDictMapper.selectPage(pages, lam); sysDictMapper.selectPage(pages, lam);
return pages; return pages;
} }