diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysUserController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysUserController.java index 7e70692..8ba906b 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysUserController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysUserController.java @@ -67,6 +67,19 @@ public class SysUserController extends BaseController { return getDataTableError(new ArrayList<>()); } + + @GetMapping("/listPro") + @Log(title = "系统管理->分公司项目部管理->权限分配->查询人员列表", businessType = BusinessType.QUERY) + public TableDataInfo listPro(SysUser bean) { + try{ + List list = userService.selectUserList(bean); + return endPage(list); + }catch (Exception e){ + logger.error(e.toString(),e); + } + return getDataTableError(new ArrayList<>()); + } + /** * 用户新增 */ @@ -278,6 +291,21 @@ public class SysUserController extends BaseController { return error("系统异常"); } + + /** + * 权限分配 + */ + @Log(title = "系统管理->人员信息->修改人员-权限分配", businessType = BusinessType.UPDATE) + @PostMapping("updatePermission") + public AjaxResult updatePermission(@Validated @RequestBody SysUser user) { + try{ + return toAjax(userService.updatePermission(user)); + } catch (Exception e) { + logger.error(e.toString(),e); + return AjaxResult.error("修改失败"); + } + } + /** * 用户模板-下载模板 * @param request diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/SysUserService.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/SysUserService.java index c8ef6b5..8254c36 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/SysUserService.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/SysUserService.java @@ -142,4 +142,6 @@ public interface SysUserService { int checkPersonAssignment(SysUser bean); List getAttGroupByUserId(SysUser user); + + int updatePermission(SysUser user); } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysUserServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysUserServiceImpl.java index 91aee5b..e8c651e 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysUserServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/service/impl/SysUserServiceImpl.java @@ -231,6 +231,20 @@ public class SysUserServiceImpl implements SysUserService return userMapper.getAttGroupByUserId(user); } + @Override + public int updatePermission(SysUser user) { + try { + Long userId = user.getUserId(); + //删除用户与角色关联 + userMapper.deleteUserRoleByUserId(userId); + insertUserRole(user); + return userMapper.updateUser(user); + } catch (Exception e) { + log.error(e.toString(),e); + return 0; + } + } + @Override @Transactional(rollbackFor = Exception.class) public int deleteUserByIds(Long userId) {