diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/dao/entity/GaeaDictItem.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/dao/entity/GaeaDictItem.java index cc5618910..6c34c39f8 100644 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/dao/entity/GaeaDictItem.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/dao/entity/GaeaDictItem.java @@ -60,7 +60,7 @@ public class GaeaDictItem extends GaeaBaseEntity implements Serializable { /** * 排序 */ - private Integer sortOrder; + private Integer sort; public String getDictCode() { return dictCode; @@ -102,12 +102,12 @@ public class GaeaDictItem extends GaeaBaseEntity implements Serializable { this.remark = remark; } - public Integer getSortOrder() { - return sortOrder; + public Integer getSort() { + return sort; } - public void setSortOrder(Integer sortOrder) { - this.sortOrder = sortOrder; + public void setSort(Integer sort) { + this.sort = sort; } public Integer getEnabled() { diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/service/impl/GaeaDictServiceImpl.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/service/impl/GaeaDictServiceImpl.java index dd378a63c..ea4fe4061 100644 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/service/impl/GaeaDictServiceImpl.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/service/impl/GaeaDictServiceImpl.java @@ -86,7 +86,7 @@ public class GaeaDictServiceImpl implements GaeaDictService { if (CollectionUtils.isEmpty(dictMap)) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.eq(GaeaDictItem::getDictCode, dictCode).eq(GaeaDictItem::getEnabled, Enabled.YES.getValue()) - .eq(GaeaDictItem::getLocale, language).orderByAsc(GaeaDictItem::getSortOrder); + .eq(GaeaDictItem::getLocale, language).orderByAsc(GaeaDictItem::getSort); List list = gaeaDictItemMapper.selectList(wrapper); @@ -154,7 +154,7 @@ public class GaeaDictServiceImpl implements GaeaDictService { public Map> all(String language) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.eq(GaeaDictItem::getEnabled, Enabled.YES.getValue()).eq(GaeaDictItem::getLocale, language) - .orderByAsc(GaeaDictItem::getSortOrder); + .orderByAsc(GaeaDictItem::getSort); List list = gaeaDictItemMapper.selectList(wrapper); Map> all = list.stream()