From ce7e6574a1f9942fc090d989b52aceaa11ba8f3e Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 15 四月 2024 21:54:08 +0800
Subject: [PATCH] 1.得分计算部分调整； 2.大屏得分计算；
---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 2b72e1a..67f05aa 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -32,26 +32,21 @@
<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>-->
create_time
)values(
<if test="userId != null and userId != ''">#{userId},</if>
<if test="deptId != null and deptId != ''">#{deptId},</if>
<if test="userName != null and userName != ''">#{userName},</if>
<if test="deptName != null and deptName != ''">#{deptName},</if>
-
<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 != ''">#{phone_number},</if>
+ <if test="phoneNumber != null and phoneNumber != ''">#{phoneNumber},</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>-->
sysdate()
)
</insert>
@@ -197,8 +192,7 @@
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
+ sr.role_name AS roleName
from sys_user u
left join sys_user_role ur on u.user_id = ur.user_id
left join sys_role sr on ur.role_id = sr.role_id
@@ -256,6 +250,7 @@
u.remark AS remark
from sys_user u
WHERE u.del_flag = 0
+ AND u.user_type = 1
</select>
<select id="selectCount" resultType="java.lang.Integer">
select count(*) from sys_user
@@ -263,7 +258,7 @@
<if test="status != null">
AND status = #{status}
</if>
- AND del_flag = 0
+ AND del_flag = 0 AND user_type = 1
</where>
</select>
<select id="selectListByNamePhone" resultType="com.ruoyi.common.core.domain.entity.SysUser">
@@ -272,9 +267,9 @@
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*/
+ remark
from sys_user u
- WHERE u.del_flag = 0
+ WHERE u.del_flag = 0 AND u.user_type = 1
<if test="name != null and name != ''">
AND (u.nick_name LIKE concat('%',#{name},'%')
OR u.phone_number LIKE concat('%',#{name},'%'))
@@ -285,7 +280,7 @@
nickName, u.email AS email, u.avatar AS avatar,
u.phone_number AS phoneNumber
from sys_user u
- WHERE u.del_flag = 0
+ WHERE u.del_flag = 0 AND u.user_type = 1
<if test="names != null and names.size()>0">
AND u.nick_name IN
<foreach close=")" collection="names" item="name" open="(" separator=",">
@@ -299,6 +294,7 @@
left join t_company t2 on t2.id = t1.companyId
left join t_qrcode tq on t1.user_id = tq.otherId and tq.type = 1
where t1.user_id = #{id}
+ AND u.user_type = 1
</select>
<select id="selectByPhone" resultType="com.ruoyi.common.core.domain.entity.SysUser">
select u.user_id AS userId,
@@ -320,12 +316,14 @@
where u.phone_number = #{phoneNumber}
and u.status = 0
and u.del_flag = 0
+ AND u.user_type = 1
</select>
<select id="getUserInfoBy" resultType="com.ruoyi.system.vo.UserInfoVo">
select t1.*, t2.companyName, t2.companyType
from sys_user t1
left join t_company t2 on t2.id = t1.companyId
where t1.singleNum = #{singleNum}
+ AND u.user_type = 1
</select>
<select id="getUserRole" resultType="java.lang.Long">
select role_id
@@ -335,6 +333,7 @@
<select id="selectAllList" resultType="com.ruoyi.common.core.domain.entity.SysUser">
select *
from sys_user
+ where user_type = 1
</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
@@ -342,15 +341,14 @@
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
+ remark, 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
from sys_user u
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
- WHERE u.del_flag = 0
- <if test="query.nickName != null and query.nickName != ''">
- AND u.nick_name LIKE concat('%',#{query.nickName},'%')
+ WHERE u.del_flag = 0 AND u.user_type = 1
+ <if test="query.userName != null and query.userName != ''">
+ AND u.user_name LIKE concat('%',#{query.userName},'%')
</if>
<if test="query.roleId != null">
AND r.role_id = #{query.roleId}
@@ -369,6 +367,7 @@
where phone_number = #{phoneNumber}
and status = 0
and del_flag = 0
+ AND user_type = 1
</select>
<select id="selectDeptUserByUserName" parameterType="java.lang.String"
resultType="com.ruoyi.common.core.domain.entity.SysUser">
--
Gitblit v1.7.1