From 83187f51aef5692354bd88ed166a748e32cc78fb Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期一, 22 八月 2022 10:58:46 +0800
Subject: [PATCH] 规章制度去掉发布版本验证
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/ExternaController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/ExternaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/ExternaController.java
index e7c9614..75e4266 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/ExternaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/ExternaController.java
@@ -61,13 +61,15 @@
public AjaxResult externaList() {
// 鏅烘帶璁惧绫诲瀷
- List<SysDictData> dict1 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT101"));
+ List<SysDictData> dict1 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT101").orderByAsc(SysDictData::getDictSort));
// 尾缃戠粶宸ヤ綔棰戞
- List<SysDictData> dict2 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT102"));
+ List<SysDictData> dict2 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT102").orderByAsc(SysDictData::getDictSort));
// 涓插彛閫氫俊娉㈢壒鐜�
- List<SysDictData> dict3 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT103"));
+ List<SysDictData> dict3 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT103").orderByAsc(SysDictData::getDictSort));
// 閲囬泦鍛ㄦ湡
- List<SysDictData> dict7 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT107"));
+ List<SysDictData> dict7 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT107").orderByAsc(SysDictData::getDictSort));
+ //鍦ㄧ敤鐘舵��
+ List<SysDictData> dict4 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT104").orderByAsc(SysDictData::getDictSort));
// 澶栬鍗曞厓
List<DevPeripheralUnit> peripheralUnit = iDevPeripheralUnitService.list(new QueryWrapper<DevPeripheralUnit>());
//澶栬鍘傚晢
@@ -80,6 +82,7 @@
map.put("DICT101", dict1);
map.put("DICT102", dict2);
map.put("DICT103", dict3);
+ map.put("DICT104", dict4);
map.put("DICT107", dict7);
map.put("peripheralUnit", peripheralUnit);
map.put("peripheralFirm", peripheralFirm);
--
Gitblit v1.9.1