From 4a3467b5d66db6ede3b4cc1b942399c7a36aadf5 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 28 八月 2025 14:01:15 +0800
Subject: [PATCH] 权限
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java | 13 ++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysQualificationsController.java | 4 +-
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 31 +++++++--------
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 8 ++--
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml | 21 +++++++---
5 files changed, 48 insertions(+), 29 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysQualificationsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysQualificationsController.java
index ef2f6e9..9877488 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysQualificationsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysQualificationsController.java
@@ -110,10 +110,10 @@
}
/**
- * 批量删除资质管理
+ * 资质管理上下架
*/
@Log(title = "资质管理信息-上下架", businessType = BusinessType.UPDATE)
- @ApiOperation(value = "批量删除资质管理")
+ @ApiOperation(value = "资质管理上下架")
@PutMapping(value = "/upAndDown")
public R<String> upAndDown(@RequestParam(value = "id") String id,
@RequestParam(value = "status")Integer status) {
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
index 94e1a18..b281940 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
@@ -5,6 +5,8 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
+
+import com.baomidou.mybatisplus.annotation.TableField;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.core.domain.BaseEntity;
@@ -62,10 +64,21 @@
/** 菜单图标 */
private String icon;
+ /** 角色类型，逗号分割 1=平台 2=分公司 3=业务员 4=供应商 5=诊所端 6=仓库员 */
+ @TableField(value = "role_type")
+ private String roleType;
/** 子菜单 */
private List<SysMenu> children = new ArrayList<SysMenu>();
+ public String getRoleType() {
+ return roleType;
+ }
+
+ public void setRoleType(String roleType) {
+ this.roleType = roleType;
+ }
+
public Long getMenuId()
{
return menuId;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 246a26d..6b53f2d 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -131,10 +131,10 @@
@TableField(exist = false)
private List<String> deptIds;
- @ApiModelProperty(value = "营业部id")
- @TableField("business_dept_id")
- private String businessDeptId;
-
+ /** 角色类型 1=平台 2=分公司 3=业务员 4=供应商 5=诊所端 6=仓库员 */
+ @ApiModelProperty(value = "角色类型 1=平台 2=分公司 3=业务员 4=供应商 5=诊所端 6=仓库员")
+ @TableField(value = "role_type")
+ private Integer roleType;
public String getRoleName() {
return roleName;
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
index 17f8a9b..cca4e22 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -25,10 +25,12 @@
<result property="updateTime" column="update_time" />
<result property="updateBy" column="update_by" />
<result property="remark" column="remark" />
+ <result property="roleType" column="role_type" />
</resultMap>
<sql id="selectMenuVo">
- select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time
+ select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible,
+ status, ifnull(perms,'') as perms, icon, create_time ,role_type
from sys_menu
</sql>
@@ -49,13 +51,15 @@
</select>
<select id="selectMenuTreeAll" resultMap="SysMenuResult">
- select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
+ select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms,
+ m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time, m.role_type
from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
order by m.parent_id, m.order_num
</select>
<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
- select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
+ select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms,
+ m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time, m.role_type
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_user_role ur on rm.role_id = ur.role_id
@@ -74,7 +78,8 @@
</select>
<select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
- select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
+ select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms,
+ m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time, m.role_type
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_user_role ur on rm.role_id = ur.role_id
@@ -134,7 +139,7 @@
<select id="selectListByRoleId" resultType="com.ruoyi.common.core.domain.entity.SysMenu">
select sm.menu_id AS menuId, sm.menu_name AS menuName, sm.parent_id AS parentId, sm.order_num AS orderNum, sm.`path` AS path, sm.component AS component,
sm.`query` AS query, sm.is_frame AS isFrame,sm.is_cache AS isCache, sm.menu_type AS menuType, sm.visible AS visible, sm.status AS status,
- ifnull(sm.perms,'') as perms, sm.icon AS icon, sm.create_time AS createTime
+ ifnull(sm.perms,'') as perms, sm.icon AS icon, sm.create_time AS createTime,, sm.role_type
from sys_role_menu srm
left join sys_menu sm on srm.menu_id = sm.menu_id
WHERE srm.role_id = #{roleId}
@@ -156,7 +161,8 @@
STATUS AS STATUS,
IFNULL( perms, '' ) AS perms,
icon AS icon,
- create_time AS createTime
+ create_time AS createTime,
+ role_type AS roleType
from sys_menu where menu_id in
<foreach collection="menusId" close=")" index="index" item="id" open="(" separator=",">
#{id}
@@ -178,7 +184,8 @@
STATUS AS STATUS,
IFNULL( perms, '' ) AS perms,
icon AS icon,
- create_time AS createTime
+ create_time AS createTime,
+ role_type AS roleType
from sys_menu
</select>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 0e84df6..2cd3055 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -25,7 +25,7 @@
<result property="remark" column="remark" />
<result property="ifBlack" column="ifBlack" />
<result property="districtId" column="districtId" />
- <result property="businessDeptId" column="business_dept_id" />
+ <result property="roleType" column="role_type" />
<association property="dept" javaType="SysDept" resultMap="deptResult" />
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
</resultMap>
@@ -50,7 +50,8 @@
</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, u.business_dept_id,
+ 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,u.role_type as roleType,
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
from sys_user u
@@ -132,7 +133,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.business_dept_id AS businessDeptId,
+ 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.role_type as roleType,
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
@@ -162,7 +164,8 @@
<select id="selectList" 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.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.role_type as roleType,
+ u.remark AS remark,u.ifBlack AS ifBlack, u.districtId AS districtId
from sys_user u
WHERE u.del_flag = 0
</select>
@@ -178,7 +181,8 @@
<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.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.role_type as roleType,
+ u.ifBlack AS ifBlack, u.districtId AS districtId
from sys_user u
WHERE u.del_flag = 0
<if test="name != null and name != ''">
@@ -207,7 +211,7 @@
<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.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark
+ u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.role_type as roleType,u.remark AS remark
from sys_user u where u.phonenumber = #{phonenumber} and u.status = 0 and u.del_flag = 0
</select>
<select id="getUserInfoBy" resultType="com.ruoyi.system.vo.UserInfoVo">
@@ -222,11 +226,12 @@
select * from sys_user
</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.disable_remark AS disableRemark,
- u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,u.operating_time AS operatingTime,u.operating_person AS operatingPerson,
+ 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.disable_remark AS disableRemark,u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag,
+ u.login_ip AS loginIp,u.operating_time AS operatingTime,u.operating_person AS operatingPerson,u.role_type as roleType,
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,
- u.business_dept_id AS businessDeptId
+ 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
left join sys_role r on r.role_id = ur.role_id
@@ -249,9 +254,6 @@
<foreach collection="query.roleIds" close=")" open="(" item="roleId" separator=",">
#{roleId}
</foreach>
- </if>
- <if test="query.businessDeptId != null and query.businessDeptId != '' and query.businessDeptId != 0">
- AND u.business_dept_id = #{query.businessDeptId}
</if>
ORDER BY u.create_time DESC
</select>
@@ -276,7 +278,6 @@
<if test="remark != null and remark != ''">remark,</if>
<if test="ifBlack != null">ifBlack,</if>
<if test="districtId != null">districtId,</if>
- <if test="businessDeptId != null">business_dept_id,</if>
create_time
)values(
<if test="userId != null and userId != ''">#{userId},</if>
@@ -295,7 +296,6 @@
<if test="remark != null and remark != ''">#{remark},</if>
<if test="ifBlack != null">#{ifBlack},</if>
<if test="districtId != null">#{districtId},</if>
- <if test="businessDeptId != null">#{businessDeptId},</if>
sysdate()
)
</insert>
@@ -322,7 +322,6 @@
<if test="disableRemark != null">disable_remark = #{disableRemark},</if>
<if test="operatingTime != null">operating_time = #{operatingTime},</if>
<if test="operatingPerson != null">operating_person = #{operatingPerson},</if>
- <if test="businessDeptId != null">business_dept_id = #{businessDeptId},</if>
update_time = sysdate()
</set>
where user_id = #{userId}
--
Gitblit v1.7.1