fix: 修复菜单和feign问题
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
package org.wfc.system.controller;
|
||||
|
||||
import com.github.pagehelper.Page;
|
||||
import org.apache.commons.lang3.ArrayUtils;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -13,11 +12,12 @@ import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import org.wfc.common.core.domain.LoginUser;
|
||||
import org.wfc.common.core.domain.R;
|
||||
import org.wfc.common.core.utils.MessageUtils;
|
||||
import org.wfc.common.core.utils.PageUtils;
|
||||
import org.wfc.common.core.utils.StringUtils;
|
||||
import org.wfc.common.core.utils.poi.ExcelUtil;
|
||||
import org.wfc.common.core.web.controller.BaseController;
|
||||
@@ -32,7 +32,6 @@ import org.wfc.common.security.utils.SecurityUtils;
|
||||
import org.wfc.system.api.domain.SysDept;
|
||||
import org.wfc.system.api.domain.SysRole;
|
||||
import org.wfc.system.api.domain.SysUser;
|
||||
import org.wfc.common.core.domain.LoginUser;
|
||||
import org.wfc.system.domain.query.UserRepeatQuery;
|
||||
import org.wfc.system.service.ISysConfigService;
|
||||
import org.wfc.system.service.ISysDeptService;
|
||||
@@ -124,11 +123,9 @@ public class SysUserController extends BaseController
|
||||
* 获取用户平台-用户列表
|
||||
*/
|
||||
@GetMapping("/listUser")
|
||||
public TableDataInfo listUser(UUser user)
|
||||
public TableDataInfo listUser(UUser user, @RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize)
|
||||
{
|
||||
startPage();
|
||||
Page<Object> localPage = PageUtils.getLocalPage();
|
||||
TableDataInfo result = remoteUUserService.page(localPage.getPageNum(), localPage.getPageSize(), user);
|
||||
TableDataInfo result = remoteUUserService.page(pageNum, pageSize, user);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user