From de762e080ce5a3e63f9a1e8a586fe0b7c9990444 Mon Sep 17 00:00:00 2001
From: GPU is all you need <2778335106@qq.com>
Date: Thu, 19 May 2022 20:42:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=AF=B9=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E7=9A=84=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../award/mapper/system/SysRoleMapper.java    |  4 ++++
 .../main/resources/mapper/SysRoleMapper.xml   | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/awardBE/src/main/java/edu/ncst/award/mapper/system/SysRoleMapper.java b/awardBE/src/main/java/edu/ncst/award/mapper/system/SysRoleMapper.java
index 4393311..d091cb2 100644
--- a/awardBE/src/main/java/edu/ncst/award/mapper/system/SysRoleMapper.java
+++ b/awardBE/src/main/java/edu/ncst/award/mapper/system/SysRoleMapper.java
@@ -1,8 +1,10 @@
 package edu.ncst.award.mapper.system;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import edu.ncst.award.common.mapper.BaseMapperPlus;
 import edu.ncst.award.model.system.Role;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -21,6 +23,8 @@ public interface SysRoleMapper extends BaseMapperPlus<SysRoleMapper, Role, Role>
      * @return 角色数据集合信息
      */
     List<Role> selectRoleList(Role role);
+
+    Page<Role> selectPageRoleList(@Param("page") Page<Role> page, @Param("role") Role role);
 //
 //    /**
 //     * 根据用户ID查询角色
diff --git a/awardBE/src/main/resources/mapper/SysRoleMapper.xml b/awardBE/src/main/resources/mapper/SysRoleMapper.xml
index c36a57b..2566c64 100644
--- a/awardBE/src/main/resources/mapper/SysRoleMapper.xml
+++ b/awardBE/src/main/resources/mapper/SysRoleMapper.xml
@@ -44,4 +44,23 @@
             and date_format(r.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
         </if>
     </select>
+    <select id="selectPageRoleList" parameterType="edu.ncst.award.model.system.Role" resultMap="SysRoleResult">
+        <include refid="selectRoleVo"/>
+        where true
+        <if test="roleId != null and roleId != 0">
+            AND r.role_id = #{roleId}
+        </if>
+        <if test="name != null and name != ''">
+            AND r.name like concat('%', #{name}, '%')
+        </if>
+        <if test="enable != null and enable != ''">
+            AND r.enable = #{enable}
+        </if>
+        <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+            and date_format(r.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+        </if>
+        <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+            and date_format(r.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+        </if>
+    </select>
 </mapper>