系统字典新增修改接口调整
parent
0b2a575612
commit
341e04faed
|
|
@ -48,7 +48,7 @@ public class SysDictBController {
|
||||||
throw new IllegalArgumentException("当前名称已存在");
|
throw new IllegalArgumentException("当前名称已存在");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (Objects.nonNull(dto.getPid())){
|
if (Objects.nonNull(dto.getPid()) && !"0".equals(dto.getPid()) ){
|
||||||
if (service.lambdaQuery().eq(SysDictB::getId,dto.getPid())
|
if (service.lambdaQuery().eq(SysDictB::getId,dto.getPid())
|
||||||
.count() == 0) {
|
.count() == 0) {
|
||||||
throw new IllegalArgumentException("当父级不存在");
|
throw new IllegalArgumentException("当父级不存在");
|
||||||
|
|
@ -70,11 +70,12 @@ public class SysDictBController {
|
||||||
|
|
||||||
if (StringUtils.isNotBlank(dto.getDictNm())){
|
if (StringUtils.isNotBlank(dto.getDictNm())){
|
||||||
if (service.lambdaQuery().eq(SysDictB::getDictNm,dto.getDictNm())
|
if (service.lambdaQuery().eq(SysDictB::getDictNm,dto.getDictNm())
|
||||||
|
.ne(SysDictB::getId,dto.getId())
|
||||||
.count() > 0) {
|
.count() > 0) {
|
||||||
throw new IllegalArgumentException("当前名称已存在");
|
throw new IllegalArgumentException("当前名称已存在");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (Objects.nonNull(dto.getPid())){
|
if (Objects.nonNull(dto.getPid()) && !"0".equals(dto.getPid()) ){
|
||||||
if (service.lambdaQuery().eq(SysDictB::getId,dto.getPid())
|
if (service.lambdaQuery().eq(SysDictB::getId,dto.getPid())
|
||||||
.count() == 0) {
|
.count() == 0) {
|
||||||
throw new IllegalArgumentException("当父级不存在");
|
throw new IllegalArgumentException("当父级不存在");
|
||||||
|
|
@ -112,6 +113,9 @@ public class SysDictBController {
|
||||||
LambdaQueryWrapper<SysDictB> queryWrapper = Wrappers.lambdaQuery();
|
LambdaQueryWrapper<SysDictB> queryWrapper = Wrappers.lambdaQuery();
|
||||||
|
|
||||||
Page<SysDictB> data = service.page(page.getPageSo().toPage(), queryWrapper.eq(SysDictB::getPid,0L));
|
Page<SysDictB> data = service.page(page.getPageSo().toPage(), queryWrapper.eq(SysDictB::getPid,0L));
|
||||||
|
|
||||||
|
data.getRecords().forEach( o-> o.setChildren(service.lambdaQuery().eq(SysDictB::getPid,o.getId()).list()));
|
||||||
|
|
||||||
return R.ok(data);
|
return R.ok(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue