From c00a73b74e67dbeb508865c3da4ed8d57c8631db Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 20 四月 2022 14:16:12 +0800
Subject: [PATCH] fix   admin LIST

---
 dao/src/main/resources/mapper/AdminMapper.xml |   37 +++++++++++++++++++++++++------------
 1 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/dao/src/main/resources/mapper/AdminMapper.xml b/dao/src/main/resources/mapper/AdminMapper.xml
index 0105f2c..c81fa44 100644
--- a/dao/src/main/resources/mapper/AdminMapper.xml
+++ b/dao/src/main/resources/mapper/AdminMapper.xml
@@ -5,18 +5,18 @@
 <mapper namespace="com.sandu.ximon.dao.mapper.AdminMapper">
 
     <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.Admin">
-            <id property="id" column="id" jdbcType="BIGINT"/>
-            <result property="username" column="username" jdbcType="VARCHAR"/>
-            <result property="password" column="password" jdbcType="VARCHAR"/>
-            <result property="icon" column="icon" jdbcType="VARCHAR"/>
-            <result property="email" column="email" jdbcType="VARCHAR"/>
-            <result property="mobile" column="mobile" jdbcType="VARCHAR"/>
-            <result property="nickName" column="nick_name" jdbcType="VARCHAR"/>
-            <result property="note" column="note" jdbcType="VARCHAR"/>
-            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-            <result property="loginTime" column="login_time" jdbcType="TIMESTAMP"/>
-            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
-            <result property="status" column="status" jdbcType="INTEGER"/>
+        <id property="id" column="id" jdbcType="BIGINT"/>
+        <result property="username" column="username" jdbcType="VARCHAR"/>
+        <result property="password" column="password" jdbcType="VARCHAR"/>
+        <result property="icon" column="icon" jdbcType="VARCHAR"/>
+        <result property="email" column="email" jdbcType="VARCHAR"/>
+        <result property="mobile" column="mobile" jdbcType="VARCHAR"/>
+        <result property="nickName" column="nick_name" jdbcType="VARCHAR"/>
+        <result property="note" column="note" jdbcType="VARCHAR"/>
+        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="loginTime" column="login_time" jdbcType="TIMESTAMP"/>
+        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+        <result property="status" column="status" jdbcType="INTEGER"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -25,4 +25,17 @@
         nick_name,note,create_time,
         login_time,update_time,status
     </sql>
+    <select id="listAdmin" resultType="com.sandu.ximon.dao.bo.AdminBo">
+        SELECT
+        t1.*,
+        t2.role_id
+        FROM
+        admin t1
+        LEFT JOIN admin_role_relation t2 ON t1.id = t2.admin_id
+        <where>
+            <if test="keyword != null and keyword != ''">
+                AND t1.username LIKE CONCAT('%', #{keyword},'%')
+            </if>
+        </where>
+    </select>
 </mapper>

--
Gitblit v1.9.3