From 24e84dca4ffd61cc92338263c3825e0944542f2e Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 06 Jun 2025 19:28:10 +0800
Subject: [PATCH] 删除用户机构
---
oying-system/src/main/resources/mapper/system/UserMapper.xml | 43 +++++++++++++------------------------------
1 files changed, 13 insertions(+), 30 deletions(-)
diff --git a/oying-system/src/main/resources/mapper/system/UserMapper.xml b/oying-system/src/main/resources/mapper/system/UserMapper.xml
index a71e0a3..a71ec72 100644
--- a/oying-system/src/main/resources/mapper/system/UserMapper.xml
+++ b/oying-system/src/main/resources/mapper/system/UserMapper.xml
@@ -3,8 +3,9 @@
<mapper namespace="com.oying.modules.system.mapper.UserMapper">
<resultMap id="BaseResultMap" type="com.oying.modules.system.domain.User">
<id column="user_user_id" property="id"/>
- <result column="user_dept_id" property="deptId"/>
<result column="user_username" property="username"/>
+ <result column="user_user_type" property="userType"/>
+ <result column="user_openid" property="openid"/>
<result column="user_nick_name" property="nickName"/>
<result column="user_email" property="email"/>
<result column="user_phone" property="phone"/>
@@ -19,10 +20,6 @@
<result column="user_update_by" property="updateBy"/>
<result column="user_create_time" property="createTime"/>
<result column="user_update_time" property="updateTime"/>
- <association property="dept" javaType="com.oying.modules.system.domain.Dept">
- <id column="dept_id" property="id"/>
- <result column="dept_name" property="name"/>
- </association>
<collection property="jobs" ofType="com.oying.modules.system.domain.Job">
<id column="job_id" property="id"/>
<result column="job_name" property="name"/>
@@ -36,12 +33,12 @@
</resultMap>
<sql id="Base_Column_List">
- u.user_id as user_user_id, u.dept_id as user_dept_id, u.username as user_username,
+ u.user_id as user_user_id, u.username as user_username,
+ u.user_type as user_user_type,u.openid as user_openid,
u.nick_name as user_nick_name, u.email as user_email, u.phone as user_phone,
u.gender as user_gender, u.avatar_name as user_avatar_name, u.avatar_path as user_avatar_path,
u.enabled as user_enabled, u.pwd_reset_time as user_pwd_reset_time, u.create_by as user_create_by,
- u.update_by as user_update_by, u.create_time as user_create_time, u.update_time as user_update_time,
- d.dept_id as dept_id, d.name as dept_name
+ u.update_by as user_update_by, u.create_time as user_create_time, u.update_time as user_update_time
</sql>
<sql id="Job_Column_List">
@@ -59,12 +56,6 @@
</if>
<if test="criteria.enabled != null">
and u.enabled = #{criteria.enabled}
- </if>
- <if test="criteria.deptIds != null and criteria.deptIds.size() != 0">
- and u.dept_id in
- <foreach collection="criteria.deptIds" item="deptId" open="(" separator="," close=")">
- #{deptId}
- </foreach>
</if>
<if test="criteria.blurry != null and criteria.blurry != ''">
and (
@@ -87,7 +78,6 @@
select
<include refid="Base_Column_List"/>
from sys_user u
- left join sys_dept d on u.dept_id = d.dept_id
<include refid="Whrer_Sql"/>
order by u.user_id desc
<if test="criteria.offset != null">
@@ -112,8 +102,15 @@
u.password user_password, u.is_admin user_is_admin,
<include refid="Base_Column_List"/>
from sys_user u
- left join sys_dept d on u.dept_id = d.dept_id
where u.username = #{username}
+ </select>
+
+ <select id="findByOpenid" resultMap="BaseResultMap">
+ select
+ u.password user_password, u.is_admin user_is_admin,
+ <include refid="Base_Column_List"/>
+ from sys_user u
+ where u.openid = #{openid}
</select>
<select id="findByEmail" resultType="com.oying.modules.system.domain.User">
@@ -132,12 +129,6 @@
group by u.user_id
</select>
- <select id="findByRoleDeptId" resultType="com.oying.modules.system.domain.User">
- SELECT u.* FROM sys_user u, sys_users_roles r, sys_roles_depts d
- WHERE u.user_id = r.user_id AND r.role_id = d.role_id AND d.dept_id = #{deptId}
- group by u.user_id
- </select>
-
<select id="findByMenuId" resultType="com.oying.modules.system.domain.User">
SELECT u.user_id as id, u.username FROM sys_user u, sys_users_roles ur, sys_roles_menus rm
WHERE u.user_id = ur.user_id AND ur.role_id = rm.role_id AND rm.menu_id = #{menuId}
@@ -149,14 +140,6 @@
WHERE u.user_id = j.user_id AND j.job_id IN
<foreach collection="jobIds" item="jobId" open="(" separator="," close=")">
#{jobId}
- </foreach>
- </select>
-
- <select id="countByDepts" resultType="int">
- SELECT count(*) FROM sys_user u
- WHERE u.dept_id IN
- <foreach collection="deptIds" item="deptId" open="(" separator="," close=")">
- #{deptId}
</foreach>
</select>
--
Gitblit v1.9.3