|
|
|
@ -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());
|
|
|
|
|