diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/UserController.java b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/UserController.java index dcc75bb..2742044 100644 --- a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/UserController.java +++ b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/UserController.java @@ -55,6 +55,13 @@ public class UserController { return ResponseResult.databaseSaveSuccess(userService.getDepartmentUser()); } + @GetMapping("/notice") + @PreAuthorize("hasAuthority('notice:manage:get')") + @Operation(summary = "获取拥有发布公告权限的用户") + public ResponseResult> getNoticeUser() { + return ResponseResult.databaseSaveSuccess(userService.getNoticeUser()); + } + @GetMapping @PreAuthorize("hasAuthority('system:user:get')") @Operation(summary = "获取所有用户(权限管理相关)") diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/UserMapper.java b/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/UserMapper.java index 882f327..0246b2a 100644 --- a/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/UserMapper.java +++ b/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/UserMapper.java @@ -25,6 +25,8 @@ public interface UserMapper extends BaseMapper { List getAllDepartmentUser(@Param("departmentId")long departmentId); + List getAllNoticeUser(); + User getOneById(@Param("id") long id); User getOneWithPowerByUsername(@Param("username") String username); diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IUserService.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IUserService.java index 40c819e..32d7820 100644 --- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IUserService.java +++ b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IUserService.java @@ -22,6 +22,8 @@ public interface IUserService extends IService { List getDepartmentUser(); + List getNoticeUser(); + IPage getAllUser(Long currentPage, Long pageSize, String searchName, List searchRole, List searchGroup, Integer searchEnable); User getUser(long id); diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/UserServiceImpl.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/UserServiceImpl.java index ac23139..45dfeb7 100644 --- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/UserServiceImpl.java +++ b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/UserServiceImpl.java @@ -89,6 +89,12 @@ public class UserServiceImpl extends ServiceImpl implements IU return userMapper.getAllDepartmentUser(departmentId); } + @Override + public List getNoticeUser() { + return userMapper.getAllNoticeUser(); + } + + @Override public IPage getAllUser(Long currentPage, Long pageSize, String searchName, List searchRole, List searchGroup, Integer searchEnable) { IPage userIPage = PageDTO.of(currentPage, pageSize); diff --git a/Pinnacle/src/main/resources/mapper/permission/UserMapper.xml b/Pinnacle/src/main/resources/mapper/permission/UserMapper.xml index af28754..e6b5181 100644 --- a/Pinnacle/src/main/resources/mapper/permission/UserMapper.xml +++ b/Pinnacle/src/main/resources/mapper/permission/UserMapper.xml @@ -220,6 +220,42 @@ and t_user.department_id = #{departmentId} + +