FatttSnake/Pinnacle-OA
1
0
Fork 0
mirror of https://github.com/FatttSnake/Pinnacle-OA.git synced 2026-04-05 23:11:24 +08:00
Code Packages Releases Activity

Added regex search in UserManagement

Browse Source
This commit is contained in:
Fat Snake
2023-06-04 04:03:56 +08:00
parent d8161667f9
commit 78b9389ebf
8 changed files with 68 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/UserController.java
View File

@@ -65,11 +65,11 @@ public class UserController {
@GetMapping
@PreAuthorize("hasAuthority('system:user:get')")
@Operation(summary = "获取所有用户（权限管理相关）")
public ResponseResult<IPage<User>> getAllUser(Long currentPage, Long pageSize, String searchName, String searchRole, String searchGroup, Integer searchEnable) {
public ResponseResult<IPage<User>> getAllUser(Long currentPage, Long pageSize, String searchName, String searchRole, String searchGroup, Integer searchEnable, Integer searchRegex) {
List<Long> searchRoleList = WebUtil.convertStringToList(searchRole, Long.class);
List<Long> searchGroupList = WebUtil.convertStringToList(searchGroup, Long.class);
IPage<User> users = userService.getAllUser(currentPage, pageSize, searchName, searchRoleList, searchGroupList, searchEnable);
IPage<User> users = userService.getAllUser(currentPage, pageSize, searchName, searchRoleList, searchGroupList, searchEnable, searchRegex);
return ResponseResult.databaseSelectSuccess(users);
}

2
Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/UserMapper.java
View File

@@ -17,7 +17,7 @@ import java.util.List;
*/
@Mapper
public interface UserMapper extends BaseMapper<User> {
List<Long> filterUserByRoleIdAndGroupId(@Param("userList") List<Long> userList, @Param("roleId") Long roleId, @Param("groupId") Long groupId, String searchName, Integer searchEnable);
List<Long> filterUserByRoleIdAndGroupId(@Param("userList") List<Long> userList, @Param("roleId") Long roleId, @Param("groupId") Long groupId, @Param("searchName") String searchName, @Param("searchEnable") Integer searchEnable, @Param("searchRegex") Integer searchRegex);
List<User> getAllWithRoleAndGroup(@Param("userList") List<User> userList);

2
Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IUserService.java
View File

@@ -24,7 +24,7 @@ public interface IUserService extends IService<User> {
List<User> getNoticeUser();
IPage<User> getAllUser(Long currentPage, Long pageSize, String searchName, List<Long> searchRole, List<Long> searchGroup, Integer searchEnable);
IPage<User> getAllUser(Long currentPage, Long pageSize, String searchName, List<Long> searchRole, List<Long> searchGroup, Integer searchEnable, Integer searchRegex);
User getUser(long id);

8
Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/UserServiceImpl.java
View File

@@ -96,13 +96,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
@Override
public IPage<User> getAllUser(Long currentPage, Long pageSize, String searchName, List<Long> searchRole, List<Long> searchGroup, Integer searchEnable) {
public IPage<User> getAllUser(Long currentPage, Long pageSize, String searchName, List<Long> searchRole, List<Long> searchGroup, Integer searchEnable, Integer searchRegex) {
IPage<User> userIPage = PageDTO.of(currentPage, pageSize);
searchName = searchName.trim();
List<Long> userList = userMapper.filterUserByRoleIdAndGroupId(null, null, null, searchName, searchEnable);
List<Long> userList = userMapper.filterUserByRoleIdAndGroupId(null, null, null, searchName, searchEnable, searchRegex);
if (userList.size() > 0) {
for (Long roleId : searchRole) {
userList = userMapper.filterUserByRoleIdAndGroupId(userList, roleId, null, null, null);
userList = userMapper.filterUserByRoleIdAndGroupId(userList, roleId, null, null, null, null);
if (userList.size() == 0) {
break;
}
@@ -110,7 +110,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
}
if (userList.size() > 0) {
for (Long groupId : searchGroup) {
userList = userMapper.filterUserByRoleIdAndGroupId(userList, null, groupId, null, null);
userList = userMapper.filterUserByRoleIdAndGroupId(userList, null, groupId, null, null, null);
if (userList.size() == 0) {
break;
}

7
Pinnacle/src/main/resources/mapper/permission/UserMapper.xml
View File

@@ -22,7 +22,12 @@
#{item}
</foreach>
<if test="searchName != null and searchName != ''">
and instr(t_user.username, #{searchName}) > 0
<if test="searchRegex == 1">
and t_user.username regexp #{searchName}
</if>
<if test="searchRegex != 1">
and instr(t_user.username, #{searchName}) > 0
</if>
</if>
<if test="searchEnable != null and searchEnable != -1">
and t_user.enable = #{searchEnable}