src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
@@ -131,15 +131,14 @@ /** * 员工列表 不分页 * @param query * @param user * @return */ @GetMapping("/userListBy") @ApiOperation(value = "分页", notes = "传入user") public R<List<UserVO>> userListBy(Query query,User user) { public R<List<UserVO>> userListBy(User user) { QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user); List<User> list = userService.list(Condition.getPage(query), queryWrapper); List<User> list = userService.list(queryWrapper); return R.data(UserWrapper.build().listVO(list)); }