From 4403a428edc18482c5aa561e603b26ebe13d328f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 02 四月 2024 18:27:02 +0800
Subject: [PATCH] 部门端登录、基础数据导入优化、得分计算优化
---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 100 ++++++++++++++++++++++++++++++-------------------
1 files changed, 61 insertions(+), 39 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 7bb34d4..30ce199 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -10,7 +10,7 @@
<result property="userName" column="user_name" />
<result property="nickName" column="nick_name" />
<result property="email" column="email" />
- <result property="phonenumber" column="phonenumber" />
+ <result property="phoneNumber" column="phone_number" />
<result property="sex" column="sex" />
<result property="avatar" column="avatar" />
<result property="password" column="password" />
@@ -24,6 +24,13 @@
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="ifBlack" column="ifBlack" />
+ <result property="areaName" column="area_name" />
+ <result property="areaAlias" column="area_alias" />
+ <result property="areaCode" column="area_code" />
+ <result property="areaLevel" column="area_level" />
+ <result property="countyFlag" column="county_flag" />
+ <result property="personInCharge" column="person_in_charge" />
+ <result property="focussed" column="focussed" />
<association property="dept" javaType="SysDept" resultMap="deptResult" />
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
</resultMap>
@@ -48,17 +55,23 @@
</resultMap>
<sql id="selectUserVo">
- select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
+ select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phone_number, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
- r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
+ r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,u.area_name,u.area_alias,u.area_code,
+ u.area_level,u.county_flag,u.person_in_charge,u.focussed
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id
left join sys_role r on r.role_id = ur.role_id
</sql>
-
+ <sql id="selectDeptUserVo">
+ select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phone_number, u.password, u.sex, u.status,
+ u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.area_name,u.area_alias,u.area_code,
+ u.area_level,u.county_flag,u.person_in_charge,u.focussed
+ from sys_user u
+ </sql>
<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
- select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date,
+ select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phone_number, u.sex, u.status, u.del_flag, u.login_ip, u.login_date,
u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
where u.del_flag = '0'
@@ -71,8 +84,8 @@
<if test="status != null and status != ''">
AND u.status = #{status}
</if>
- <if test="phonenumber != null and phonenumber != ''">
- AND u.phonenumber like concat('%', #{phonenumber}, '%')
+ <if test="phoneNumber != null and phoneNumber != ''">
+ AND u.phone_number like concat('%', #{phoneNumber}, '%')
</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
AND date_format(u.create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d')
@@ -88,7 +101,7 @@
</select>
<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
- select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+ select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phone_number, u.status, u.create_time
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id
@@ -97,15 +110,15 @@
<if test="userName != null and userName != ''">
AND u.user_name like concat('%', #{userName}, '%')
</if>
- <if test="phonenumber != null and phonenumber != ''">
- AND u.phonenumber like concat('%', #{phonenumber}, '%')
+ <if test="phoneNumber != null and phoneNumber != ''">
+ AND u.phone_number like concat('%', #{phoneNumber}, '%')
</if>
<!-- 数据范围过滤 -->
${params.dataScope}
</select>
<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
- select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+ select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phone_number, u.status, u.create_time
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id
@@ -115,8 +128,8 @@
<if test="userName != null and userName != ''">
AND u.user_name like concat('%', #{userName}, '%')
</if>
- <if test="phonenumber != null and phonenumber != ''">
- AND u.phonenumber like concat('%', #{phonenumber}, '%')
+ <if test="phoneNumber != null and phoneNumber != ''">
+ AND u.phone_number like concat('%', #{phoneNumber}, '%')
</if>
<!-- 数据范围过滤 -->
${params.dataScope}
@@ -129,8 +142,8 @@
<select id="selectUserById" parameterType="Long" resultType="com.ruoyi.common.core.domain.entity.SysUser">
select u.user_id AS userId, u.dept_id AS deptId, u.user_name AS userName, u.nick_name AS nickName, u.email AS email, u.avatar AS avatar,
- u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,
- u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.ifBlack AS ifBlack, u.districtId AS districtId,
+ u.phone_number AS phoneNumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,
+ u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,/*u.ifBlack AS ifBlack,u.districtId AS districtId,*/
ur.role_id AS roleId,sr.role_name AS roleName,u.deptName as deptName
from sys_user u
left join sys_user_role ur on u.user_id = ur.user_id
@@ -144,23 +157,23 @@
</select>
<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
- select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1
+ select user_id, phoneNumber from sys_user where phone_number = #{phoneNumber} and del_flag = '0' limit 1
</select>
<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
</select>
<select id="selectUserByIds" resultType="com.ruoyi.common.core.domain.entity.SysUser">
- select user_id AS userId, dept_id AS deptId, user_name AS userName, nick_name AS nickName, email AS email, avatar AS avatar, phonenumber AS phonenumber
+ select user_id AS userId, dept_id AS deptId, user_name AS userName, nick_name AS nickName, email AS email, avatar AS avatar, phone_number AS phoneNumber
from sys_user where user_id in
<foreach collection="userIds" separator="," item="userId" open="(" close=")">
#{userId}
</foreach>
</select>
- <select id="selectList" resultType="com.ruoyi.common.core.domain.entity.SysUser">
+ <select id="queryList" resultType="com.ruoyi.common.core.domain.entity.SysUser">
select u.user_id AS userId, u.dept_id AS deptId, u.user_name AS userName, u.nick_name AS nickName, u.email AS email, u.avatar AS avatar,
- u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,
- u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.ifBlack AS ifBlack, u.districtId AS districtId
+ u.phone_number AS phoneNumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,
+ u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark
from sys_user u
WHERE u.del_flag = 0
</select>
@@ -175,18 +188,18 @@
</select>
<select id="selectListByNamePhone" resultType="com.ruoyi.common.core.domain.entity.SysUser">
select u.user_id AS userId, u.dept_id AS deptId, u.user_name AS userName, u.nick_name AS nickName, u.email AS email, u.avatar AS avatar,
- u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,
- u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.ifBlack AS ifBlack, u.districtId AS districtId
+ u.phone_number AS phoneNumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,
+ u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,/*u.ifBlack AS ifBlack,u.districtId AS districtId*/
from sys_user u
WHERE u.del_flag = 0
<if test="name != null and name != ''">
AND (u.nick_name LIKE concat('%',#{name},'%')
- OR u.phonenumber LIKE concat('%',#{name},'%'))
+ OR u.phone_number LIKE concat('%',#{name},'%'))
</if>
</select>
<select id="selectUserByUserNameList" resultType="com.ruoyi.common.core.domain.entity.SysUser">
select u.user_id AS userId, u.dept_id AS deptId, u.user_name AS userName, u.nick_name AS nickName, u.email AS email, u.avatar AS avatar,
- u.phonenumber AS phonenumber
+ u.phone_number AS phoneNumber
from sys_user u
WHERE u.del_flag = 0
<if test="names != null and names.size()>0">
@@ -204,9 +217,9 @@
</select>
<select id="selectByPhone" resultType="com.ruoyi.common.core.domain.entity.SysUser">
select u.user_id AS userId, u.dept_id AS deptId, u.user_name AS userName, u.nick_name AS nickName, u.email AS email, u.avatar AS avatar,
- u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,
+ u.phone_number AS phoneNumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,
u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark
- from sys_user u where u.phonenumber = #{phonenumber} and u.status = 0 and u.del_flag = 0
+ from sys_user u where u.phone_number = #{phoneNumber} and u.status = 0 and u.del_flag = 0
</select>
<select id="getUserInfoBy" resultType="com.ruoyi.system.vo.UserInfoVo">
select t1.*,t2.companyName,t2.companyType from sys_user t1
@@ -221,8 +234,8 @@
</select>
<select id="pageList" resultType="com.ruoyi.system.vo.SysUserVO">
select u.user_id AS userId, u.dept_id AS deptId, u.user_name AS userName, u.nick_name AS nickName, u.email AS email, u.avatar AS avatar,
- u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,
- u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.ifBlack AS ifBlack, u.districtId AS districtId,
+ u.phone_number AS phoneNumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,
+ u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,/*u.ifBlack AS ifBlack, u.districtId AS districtId,*/
r.role_id AS roleId, r.role_name AS roleName, r.role_key AS roleKey, r.role_sort AS roleSort, r.data_scope AS dataScope, r.status as role_status,u.deptName as deptName
from sys_user u
left join sys_user_role ur on u.user_id = ur.user_id
@@ -234,8 +247,8 @@
<if test="query.roleId != null">
AND r.role_id = #{query.roleId}
</if>
- <if test="query.phonenumber != null and query.phonenumber != ''">
- AND u.phonenumber LIKE concat('%',#{query.phonenumber},'%')
+ <if test="query.phoneNumber != null and query.phoneNumber != ''">
+ AND u.phone_number LIKE concat('%',#{query.phoneNumber},'%')
</if>
<if test="query.status != null and query.status != ''">
AND u.status = #{query.status}
@@ -243,7 +256,17 @@
ORDER BY u.create_time DESC
</select>
<select id="selectIdByPhone" resultType="java.lang.Long">
- select user_id from sys_user where phonenumber = #{phonenumber} and status = 0 and del_flag = 0
+ select user_id from sys_user where phone_number = #{phoneNumber} and status = 0 and del_flag = 0
+ </select>
+ <select id="selectDeptUserByUserName" resultType="com.ruoyi.common.core.domain.entity.SysUser"
+ parameterType="java.lang.String">
+ <include refid="selectUserVo"/>
+ where u.user_name = #{userName} and u.del_flag = '0' and u.user_type = '2'
+ </select>
+ <select id="selectPlatUserByUserName" resultType="com.ruoyi.common.core.domain.entity.SysUser"
+ parameterType="java.lang.String">
+ <include refid="selectUserVo"/>
+ where u.user_name = #{userName} and u.del_flag = '0' and u.user_type = '1'
</select>
<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
@@ -255,14 +278,14 @@
<if test="nickName != null and nickName != ''">nick_name,</if>
<if test="email != null and email != ''">email,</if>
<if test="avatar != null and avatar != ''">avatar,</if>
- <if test="phonenumber != null and phonenumber != ''">phonenumber,</if>
+ <if test="phoneNumber != null and phoneNumber != ''">phone_number,</if>
<if test="sex != null and sex != ''">sex,</if>
<if test="password != null and password != ''">password,</if>
<if test="status != null and status != ''">status,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="remark != null and remark != ''">remark,</if>
- <if test="ifBlack != null">ifBlack,</if>
- <if test="districtId != null">districtId,</if>
+<!-- <if test="ifBlack != null">ifBlack,</if>-->
+<!-- <if test="districtId != null">districtId,</if>-->
create_time
)values(
<if test="userId != null and userId != ''">#{userId},</if>
@@ -273,14 +296,14 @@
<if test="nickName != null and nickName != ''">#{nickName},</if>
<if test="email != null and email != ''">#{email},</if>
<if test="avatar != null and avatar != ''">#{avatar},</if>
- <if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if>
+ <if test="phoneNumber != null and phoneNumber != ''">#{phone_number},</if>
<if test="sex != null and sex != ''">#{sex},</if>
<if test="password != null and password != ''">#{password},</if>
<if test="status != null and status != ''">#{status},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="remark != null and remark != ''">#{remark},</if>
- <if test="ifBlack != null">#{ifBlack},</if>
- <if test="districtId != null">#{districtId},</if>
+<!-- <if test="ifBlack != null">#{ifBlack},</if>-->
+<!-- <if test="districtId != null">#{districtId},</if>-->
sysdate()
)
</insert>
@@ -293,7 +316,7 @@
<if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
<if test="deptName != null and deptName != ''">deptName = #{deptName},</if>
<if test="email != null ">email = #{email},</if>
- <if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
+ <if test="phoneNumber != null ">phone_number = #{phoneNumber},</if>
<if test="sex != null and sex != ''">sex = #{sex},</if>
<if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
<if test="password != null and password != ''">password = #{password},</if>
@@ -302,7 +325,6 @@
<if test="loginDate != null">login_date = #{loginDate},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="remark != null">remark = #{remark},</if>
- <if test="ifBlack != null">ifBlack = #{ifBlack},</if>
update_time = sysdate()
</set>
where user_id = #{userId}
--
Gitblit v1.7.1