From cd34c87afa730c48e2b2be61d700b1fee409e02c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 12 七月 2021 11:00:12 +0800
Subject: [PATCH] fix 修复升级合并错误

---
 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java
index 7f09d7c..db5c98e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java
@@ -1,7 +1,10 @@
 package com.ruoyi.system.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.core.domain.entity.SysDictData;
-import com.ruoyi.common.core.page.BaseMapperPlus;
+import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+
+import java.util.List;
 
 /**
  * 瀛楀吀琛� 鏁版嵁灞�
@@ -10,4 +13,11 @@
  */
 public interface SysDictDataMapper extends BaseMapperPlus<SysDictData> {
 
+	default List<SysDictData> selectDictDataByType(String dictType) {
+		return selectList(
+			new LambdaQueryWrapper<SysDictData>()
+				.eq(SysDictData::getStatus, "0")
+				.eq(SysDictData::getDictType, dictType)
+				.orderByAsc(SysDictData::getDictSort));
+	}
 }

--
Gitblit v1.9.3