zianxin/pigx
1
0 Fork 0
mirror of http://git.pig4cloud.com/pig/pigx.git synced 2026-11-12 21:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

⏪ Reverting changes.回滚sort字段

Browse Source
This commit is contained in:
lishangbu committed 2021-12-30 02:46:53 +08:00
1 parent fed616b171
commit 2026580834
2 files changed
+7 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/dao/entity/GaeaDictItem.java
+5 -5
View File
@@ -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() {
pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/service/impl/GaeaDictServiceImpl.java
+2 -2
View File
@@ -86,7 +86,7 @@ public class GaeaDictServiceImpl implements GaeaDictService {
if (CollectionUtils.isEmpty(dictMap)) {
LambdaQueryWrapper<GaeaDictItem> 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<GaeaDictItem> list = gaeaDictItemMapper.selectList(wrapper);
@@ -154,7 +154,7 @@ public class GaeaDictServiceImpl implements GaeaDictService {
public Map<String, List<KeyValue>> all(String language) {
LambdaQueryWrapper<GaeaDictItem> wrapper = Wrappers.lambdaQuery();
wrapper.eq(GaeaDictItem::getEnabled, Enabled.YES.getValue()).eq(GaeaDictItem::getLocale, language)
.orderByAsc(GaeaDictItem::getSortOrder);
.orderByAsc(GaeaDictItem::getSort);
List<GaeaDictItem> list = gaeaDictItemMapper.selectList(wrapper);
Map<String, List<KeyValue>> all = list.stream()