From 6789710d9093ffea7ddea3ef45c9f5f4b98ee8fa Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 21 Mar 2023 16:42:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B4=A6=E5=8F=B7=E4=B8=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=A8=A1=E5=9D=97bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/auth/SysUserController.java | 18 ++++++++++++++++-- .../glxp/api/dao/auth/SysUserRoleMapper.java | 4 ++++ .../api/service/auth/AuthAdminService.java | 5 +++++ .../auth/impl/AuthAdminServiceImpl.java | 10 ++++++++++ .../mybatis/mapper/auth/SysUserRoleMapper.xml | 10 ++++++++++ 5 files changed, 45 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/SysUserController.java b/src/main/java/com/glxp/api/controller/auth/SysUserController.java index 15543a03..dc606e97 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysUserController.java @@ -11,6 +11,7 @@ import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.DeptUserEntity; import com.glxp.api.entity.auth.SysRole; +import com.glxp.api.entity.auth.SysUserRole; import com.glxp.api.req.auth.FilterAuthUserRequest; import com.glxp.api.req.auth.AuthUserSaveRequest; import com.glxp.api.res.PageSimpleResponse; @@ -165,9 +166,18 @@ public class SysUserController extends BaseController { } // 插入角色 - if (authUserSaveRequest.getRoles() != null) { + if (authUserSaveRequest.getRoles().size()!=0) { userService.insertUserAuth(authAdmin.getId(), authUserSaveRequest.getRoles()); } + //先获取角色id + SysUserRole sysUserRole1 = userService.selectByAuthId(curUser.getId()); + SysUserRole sysUserRole = new SysUserRole(); + sysUserRole.setUserId(authAdmin.getId()); + sysUserRole.setRoleId(sysUserRole1.getRoleId()); + userService.insertUserAuth1(sysUserRole); + + + //插入部门 if (CollUtil.isNotEmpty(authUserSaveRequest.getDepts())) { @@ -224,7 +234,11 @@ public class SysUserController extends BaseController { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); } // 修改角色 - userService.insertUserAuth(authAdmin.getId(), authUserSaveRequest.getRoles()); + // userService.insertUserAuth(authAdmin.getId(), authUserSaveRequest.getRoles()); + + userService.updateAuthAdmin(authAdmin); + + //修改所属部门 deptUserService.deleteByUser(authUserSaveRequest.getId()); diff --git a/src/main/java/com/glxp/api/dao/auth/SysUserRoleMapper.java b/src/main/java/com/glxp/api/dao/auth/SysUserRoleMapper.java index 2d3dd67c..691f8fe5 100644 --- a/src/main/java/com/glxp/api/dao/auth/SysUserRoleMapper.java +++ b/src/main/java/com/glxp/api/dao/auth/SysUserRoleMapper.java @@ -15,4 +15,8 @@ public interface SysUserRoleMapper { int insertBatch(@Param("sysUserRoles") List sysUserRoles); + int insert(SysUserRole sysUserRole); + + SysUserRole selectByAuthId(Long id); + } diff --git a/src/main/java/com/glxp/api/service/auth/AuthAdminService.java b/src/main/java/com/glxp/api/service/auth/AuthAdminService.java index 6960375a..ee75cac4 100644 --- a/src/main/java/com/glxp/api/service/auth/AuthAdminService.java +++ b/src/main/java/com/glxp/api/service/auth/AuthAdminService.java @@ -2,6 +2,7 @@ package com.glxp.api.service.auth; import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.auth.SysUserRole; import com.glxp.api.req.auth.FilterAuthUserRequest; import com.glxp.api.req.auth.FilterNoSelectUserRequest; import org.apache.ibatis.annotations.Param; @@ -47,5 +48,9 @@ public interface AuthAdminService { void insertUserAuth(Long userId, List roleIds); + void insertUserAuth1(SysUserRole sysUserRole); + List findByCustomerId(String customerId); + + SysUserRole selectByAuthId(Long id); } diff --git a/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java index 09a2c6ef..b4ef0258 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java @@ -175,11 +175,21 @@ public class AuthAdminServiceImpl implements AuthAdminService { insertUserRole(userId, roleIds); } + @Override + public void insertUserAuth1(SysUserRole sysUserRole) { + sysUserRoleMapper.insert(sysUserRole); + } + @Override public List findByCustomerId(String customerId) { return authAdminDao.findByCustomerId(customerId); } + @Override + public SysUserRole selectByAuthId(Long id) { + return sysUserRoleMapper.selectByAuthId(id); + } + public void insertUserRole(Long userId, List roleIds) { if (ArrayUtil.isNotEmpty(roleIds)) { diff --git a/src/main/resources/mybatis/mapper/auth/SysUserRoleMapper.xml b/src/main/resources/mybatis/mapper/auth/SysUserRoleMapper.xml index 78fda4c4..58bf6871 100644 --- a/src/main/resources/mybatis/mapper/auth/SysUserRoleMapper.xml +++ b/src/main/resources/mybatis/mapper/auth/SysUserRoleMapper.xml @@ -15,6 +15,11 @@ on u.id = sur.user_id and sur.role_id = #{roleId} + + DELETE @@ -29,6 +34,11 @@ + + insert INTO auth_user_role values ( #{userId}, + #{roleId}) + + insert INTO auth_user_role