From 0626b9c47d83db27039499fadd3e609b50aa7ed3 Mon Sep 17 00:00:00 2001 From: weiweiw <14335254+weiweiw22@user.noreply.gitee.com> Date: Mon, 11 Nov 2024 11:56:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=92=8C=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=AF=B9=E5=86=85=E7=BD=AE=E5=B1=9E=E6=80=A7=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/system/api/domain/SysRole.java | 11 +++++++++++ .../java/com/bonus/system/api/domain/SysUser.java | 11 +++++++++++ .../bonus/system/controller/SysRoleController.java | 5 +++++ .../bonus/system/controller/SysUserController.java | 4 ++++ .../system/service/impl/SysUserServiceImpl.java | 1 + .../main/resources/mapper/system/SysRoleMapper.xml | 6 +++++- .../main/resources/mapper/system/SysUserMapper.xml | 13 +++++++++---- 7 files changed, 46 insertions(+), 5 deletions(-) diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java index 3792b0e..bccbb12 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java @@ -68,6 +68,9 @@ public class SysRole extends BaseEntity /** 角色菜单权限 */ private Set permissions; + /**是否内置，0内置，1非内置*/ + private String isBuiltIn; + public SysRole() { @@ -242,4 +245,12 @@ public class SysRole extends BaseEntity .append("remark", getRemark()) .toString(); } + + public String getIsBuiltIn() { + return isBuiltIn; + } + + public void setIsBuiltIn(String isBuiltIn) { + this.isBuiltIn = isBuiltIn; + } } diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java index f7cdca6..1fcf2fc 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java @@ -143,6 +143,9 @@ public class SysUser extends BaseEntity { */ private String isPermanent; + /**是否内置，0内置，1非内置*/ + private String isBuiltIn = "1"; + public SysUser() { } @@ -361,4 +364,12 @@ public class SysUser extends BaseEntity { .append("loginType", getLoginType()) .toString(); } + + public String getIsBuiltIn() { + return isBuiltIn; + } + + public void setIsBuiltIn(String isBuiltIn) { + this.isBuiltIn = isBuiltIn; + } } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysRoleController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysRoleController.java index a7fbfa3..93096d9 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysRoleController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysRoleController.java @@ -2,6 +2,7 @@ package com.bonus.system.controller; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import javax.servlet.http.HttpServletResponse; import com.bonus.common.log.annotation.SysLog; @@ -106,6 +107,8 @@ public class SysRoleController extends BaseController return error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在"); } else if (!roleService.checkRoleKeyUnique(role)) { return error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在"); + }else if (Objects.equals(role.getIsBuiltIn(), "0")) { + return error("内置角色不允许增加"); } role.setCreateBy(SecurityUtils.getUsername()); return toAjax(roleService.insertRole(role)); @@ -129,6 +132,8 @@ public class SysRoleController extends BaseController return error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在"); } else if (!roleService.checkRoleKeyUnique(role)) { return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在"); + }else if (Objects.equals(role.getIsBuiltIn(), "0")) { + return error("内置角色不允许修改"); } role.setUpdateBy(SecurityUtils.getUsername()); return toAjax(roleService.updateRole(role)); diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java index eda2eae..42e8741 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java @@ -300,6 +300,8 @@ public class SysUserController extends BaseController { return error("新增用户'" + user.getUserName() + "'失败，手机号码已存在"); } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) { return error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在"); + } else if (Objects.equals(user.getIsBuiltIn(), "0")){ + return error("内置用户不允许添加"); } /*String pwd = ValidateUtils.isPwd(user.getPassword()); if (StringUtils.isNotEmpty(pwd)) { @@ -337,6 +339,8 @@ public class SysUserController extends BaseController { return error("修改用户'" + user.getUserName() + "'失败，手机号码已存在"); } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) { return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在"); + }else if (Objects.equals(user.getIsBuiltIn(), "0")){ + return error("内置用户不允许修改"); } user.setUpdateBy(SecurityUtils.getUsername()); return toAjax(userService.updateUser(user)); diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java index 07472d7..af04904 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java @@ -37,6 +37,7 @@ import javax.annotation.Resource; import javax.validation.Validator; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; /** diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml index 830bfe7..d1f9393 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -19,11 +19,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly, - r.status, r.del_flag, r.create_time, r.remark + r.status, r.del_flag, r.create_time, r.remark, r.is_built_in from sys_role r left join sys_user_role ur on ur.role_id = r.role_id left join sys_user u on u.user_id = ur.user_id @@ -105,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" status, remark, create_by, + is_built_in, create_time )values( #{roleId}, @@ -117,6 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{status}, #{remark}, #{createBy}, + #{isBuiltIn}, sysdate() ) @@ -133,6 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" status = #{status}, remark = #{remark}, update_by = #{updateBy}, + is_built_in = #{isBuiltIn}, update_time = sysdate() where role_id = #{roleId} diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml index e97630e..68b00c0 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -26,6 +26,7 @@ + @@ -82,7 +83,8 @@ r.role_sort, r.data_scope, r.status as role_status, - u.login_type + u.login_type, + u.is_built_in 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 @@ -91,7 +93,7 @@