From 15d773590260c1eaa354ff4aef6ee75626115879 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Wed, 27 Jul 2022 19:00:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yxt/anrui/portal/api/dicttype/DictTypeQuery.java     | 3 +++
 .../com/yxt/anrui/portal/biz/dicttype/DictTypeService.java   | 5 ++++-
 .../anrui/portal/biz/syssourcemenu/SysSourceMenuMapper.xml   | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dicttype/DictTypeQuery.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dicttype/DictTypeQuery.java
index a26a1e8d0c..dad1181a71 100644
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dicttype/DictTypeQuery.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dicttype/DictTypeQuery.java
@@ -18,4 +18,7 @@ public class DictTypeQuery implements Query {
 
     @ApiModelProperty(value = "数据分类名称", required = false)
     private String dictTypeName;
+
+    @ApiModelProperty(value = "说明", required = false)
+    private String remarks;
 }
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dicttype/DictTypeService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dicttype/DictTypeService.java
index e8ba9ce2eb..b8f7304b66 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dicttype/DictTypeService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dicttype/DictTypeService.java
@@ -17,7 +17,7 @@ import org.springframework.stereotype.Service;
  * @description 数据字典类型实现类
  */
 @Service
-public class DictTypeService extends MybatisBaseService<DictTypeMapper, DictType>{
+public class DictTypeService extends MybatisBaseService<DictTypeMapper, DictType> {
 
     /**
      * 根据此类型代码存在的数量
@@ -43,6 +43,9 @@ public class DictTypeService extends MybatisBaseService<DictTypeMapper, DictType
             if (StringUtils.isNotBlank(dictTypeName)) {
                 qw.like("dt.dictTypeName", dictTypeName);
             }
+            if (StringUtils.isNotBlank(params.getRemarks())) {
+                qw.like("dt.remarks", params.getRemarks());
+            }
         }
         qw.orderByDesc("dt.createTime");
         return baseMapper.pageList(page, qw);
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/syssourcemenu/SysSourceMenuMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/syssourcemenu/SysSourceMenuMapper.xml
index 9cfdca2203..b4bb39f9a5 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/syssourcemenu/SysSourceMenuMapper.xml
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/syssourcemenu/SysSourceMenuMapper.xml
@@ -40,5 +40,6 @@
                      LEFT JOIN sys_source source ON sourceMenu.sourceSid = source.sid
         WHERE sourceMenu.sourceSid = #{sourceSid}
         GROUP BY menuRootSid
+        ORDER BY sortNo ASC
     </select>
 </mapper>
\ No newline at end of file