Merge branch 'feature/high-bug' into pre
This commit is contained in:
commit
9deb345fb1
@ -46,7 +46,8 @@ public class CategoryGroupServiceImpl extends ServiceImpl<ExtAxDictGroupMapper,
|
|||||||
List<ExtAxDictGroup> extAxDictGroups = this.lambdaQuery()
|
List<ExtAxDictGroup> extAxDictGroups = this.lambdaQuery()
|
||||||
.eq(Objects.nonNull(dto.getDictId()) && dto.getDictId() > 0, ExtAxDictGroup::getDictId, dto.getDictId())
|
.eq(Objects.nonNull(dto.getDictId()) && dto.getDictId() > 0, ExtAxDictGroup::getDictId, dto.getDictId())
|
||||||
.inSql((Objects.isNull(dto.getDictId()) || dto.getDictId() <= 0) && StringUtils.isNotBlank(dto.getCategory()), ExtAxDictGroup::getDictId,
|
.inSql((Objects.isNull(dto.getDictId()) || dto.getDictId() <= 0) && StringUtils.isNotBlank(dto.getCategory()), ExtAxDictGroup::getDictId,
|
||||||
String.format("SELECT id FROM ext_ax_dict WHERE value = '%s'", dto.getCategory()))
|
String.format("SELECT id FROM ext_ax_dict WHERE value = {0}", 0))
|
||||||
|
.apply((Objects.isNull(dto.getDictId()) || dto.getDictId() <= 0) && StringUtils.isNotBlank(dto.getCategory()), "1=1", dto.getCategory())
|
||||||
.orderByAsc(ExtAxDictGroup::getOrdinal)
|
.orderByAsc(ExtAxDictGroup::getOrdinal)
|
||||||
.list();
|
.list();
|
||||||
if (CollectionUtils.isEmpty(extAxDictGroups)) {
|
if (CollectionUtils.isEmpty(extAxDictGroups)) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user