This commit is contained in:
张良(004796)
2024-03-11 18:14:31 +08:00
parent c47e71b301
commit 2bd2871df0
31 changed files with 175 additions and 68 deletions

View File

@@ -1,7 +1,6 @@
package com.ruoyi.xq.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
@@ -13,6 +12,7 @@ import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.xq.domain.UserInfo;
import com.ruoyi.xq.dto.admin.user.UserInfoAdminVo;
import com.ruoyi.xq.service.UserInfoService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -41,8 +41,8 @@ public class UserInfoController extends BaseController {
*/
@SaCheckPermission("xq:userInfo:list")
@GetMapping("/list")
public TableDataInfo<UserInfo> list(UserInfo bo, PageQuery pageQuery) {
Page<UserInfo> page = userInfoService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
public TableDataInfo<UserInfoAdminVo> list(UserInfoAdminVo bo, PageQuery pageQuery) {
Page<UserInfoAdminVo> page = userInfoService.appPage(pageQuery, bo);
return TableDataInfo.build(page);
}