后台学员列表返回无条件的total

This commit is contained in:
none 2023-04-18 09:35:00 +08:00
parent e70301bdbf
commit 599d5938a7

View File

@ -49,7 +49,6 @@ import java.util.stream.Collectors;
/** /**
* @Author 杭州白书科技有限公司 * @Author 杭州白书科技有限公司
*
* @create 2023/2/23 09:48 * @create 2023/2/23 09:48
*/ */
@RestController @RestController
@ -57,21 +56,29 @@ import java.util.stream.Collectors;
@RequestMapping("/backend/v1/user") @RequestMapping("/backend/v1/user")
public class UserController { public class UserController {
@Autowired private UserService userService; @Autowired
private UserService userService;
@Autowired private UserDepartmentService userDepartmentService; @Autowired
private UserDepartmentService userDepartmentService;
@Autowired private DepartmentService departmentService; @Autowired
private DepartmentService departmentService;
@Autowired private ApplicationContext context; @Autowired
private ApplicationContext context;
@Autowired private UserCourseHourRecordService userCourseHourRecordService; @Autowired
private UserCourseHourRecordService userCourseHourRecordService;
@Autowired private UserCourseRecordService userCourseRecordService; @Autowired
private UserCourseRecordService userCourseRecordService;
@Autowired private CourseHourService courseHourService; @Autowired
private CourseHourService courseHourService;
@Autowired private CourseService courseService; @Autowired
private CourseService courseService;
@BackendPermissionMiddleware(slug = BPermissionConstant.USER_INDEX) @BackendPermissionMiddleware(slug = BPermissionConstant.USER_INDEX)
@GetMapping("/index") @GetMapping("/index")
@ -120,6 +127,7 @@ public class UserController {
"user_dep_ids", "user_dep_ids",
userService.getDepIdsGroup(result.getData().stream().map(User::getId).toList())); userService.getDepIdsGroup(result.getData().stream().map(User::getId).toList()));
data.put("departments", departmentService.id2name()); data.put("departments", departmentService.id2name());
data.put("pure_total", userService.total());
return JsonResponse.data(data); return JsonResponse.data(data);
} }