From e86765c6bc716f566738d7b2d9e309cbd5b25e87 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 28 七月 2023 13:53:05 +0800
Subject: [PATCH] * update springboot 3.0.8 => 3.1.2 * update spring-mybatis 3.0.1 => 3.0.2 * update easyexcel 3.3.1 => 3.3.2 * update hutool 5.8.18 => 5.8.20 * update redisson 3.20.1 => 3.23.1 * update dynamic-ds 4.1.1 => 4.1.2 * update mapstruct-plus 1.3.1 => 1.3.5 * update aws-java-sdk-s3 1.12.400 => 1.12.517 * update maven-surefire-plugin 3.0.0 => 3.1.2
---
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index a70cd5f..0b67a33 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -2,26 +2,32 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.SysUserMapper">
+<mapper namespace="org.dromara.system.mapper.SysUserMapper">
<!-- 澶氱粨鏋勫祵濂楄嚜鍔ㄦ槧灏勯渶甯︿笂姣忎釜瀹炰綋鐨勪富閿甶d 鍚﹀垯鏄犲皠浼氬け璐� -->
- <resultMap type="com.ruoyi.system.domain.SysUser" id="SysUserResult">
+ <resultMap type="org.dromara.system.domain.vo.SysUserVo" id="SysUserResult">
<id property="userId" column="user_id"/>
<result property="deptId" column="dept_id"/>
<association property="dept" column="dept_id" resultMap="deptResult"/>
<collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
</resultMap>
- <resultMap id="deptResult" type="com.ruoyi.system.domain.SysDept">
+ <resultMap id="deptResult" type="org.dromara.system.domain.vo.SysDeptVo">
<id property="deptId" column="dept_id"/>
+ <id property="email" column="dept_email"/>
+ <id property="status" column="dept_status"/>
+ <id property="createTime" column="dept_create_time"/>
</resultMap>
- <resultMap id="RoleResult" type="com.ruoyi.system.domain.SysRole">
+ <resultMap id="RoleResult" type="org.dromara.system.domain.vo.SysRoleVo">
<id property="roleId" column="role_id"/>
+ <id property="status" column="role_status"/>
+ <id property="createTime" column="role_create_time"/>
</resultMap>
<sql id="selectUserVo">
select u.user_id,
+ u.tenant_id,
u.dept_id,
u.user_name,
u.nick_name,
@@ -45,6 +51,8 @@
d.order_num,
d.leader,
d.status as dept_status,
+ d.email as dept_email,
+ d.create_time as dept_cteate_time,
r.role_id,
r.role_name,
r.role_key,
@@ -101,6 +109,26 @@
where u.del_flag = '0' and u.phonenumber = #{phonenumber}
</select>
+ <select id="selectUserByEmail" parameterType="String" resultMap="SysUserResult">
+ <include refid="selectUserVo"/>
+ where u.del_flag = '0' and u.email = #{email}
+ </select>
+
+ <select id="selectTenantUserByUserName" parameterType="String" resultMap="SysUserResult">
+ <include refid="selectUserVo"/>
+ where u.del_flag = '0' and u.user_name = #{userName} and u.tenant_id = #{tenantId}
+ </select>
+
+ <select id="selectTenantUserByPhonenumber" parameterType="String" resultMap="SysUserResult">
+ <include refid="selectUserVo"/>
+ where u.del_flag = '0' and u.phonenumber = #{phonenumber} and u.tenant_id = #{tenantId}
+ </select>
+
+ <select id="selectTenantUserByEmail" parameterType="String" resultMap="SysUserResult">
+ <include refid="selectUserVo"/>
+ where u.del_flag = '0' and u.email = #{email} and u.tenant_id = #{tenantId}
+ </select>
+
<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
<include refid="selectUserVo"/>
where u.del_flag = '0' and u.user_id = #{userId}
--
Gitblit v1.9.3