WFC/be.wfc
2
0
Fork 0
Code Activity

feat: add list user in sys

Browse Source
This commit is contained in:
caiyuchao
2024-12-13 15:02:58 +08:00
parent d1e99f28ed
commit 967a65f571
6 changed files with 66 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/controller/UUserController.java
View File

@@ -113,6 +113,14 @@ public class UUserController extends BaseController
return getDataTable(list);
}
@PostMapping("/page")
public TableDataInfo page(@RequestBody UUser user)
{
startPage();
List<UUser> list = userService.selectUserList(user);
return getDataTable(list);
}
@Log(title = "用户管理", businessType = BusinessType.EXPORT)
@RequiresPermissions("Utem:user:export")
@PostMapping("/export")
@@ -290,9 +298,9 @@ public class UUserController extends BaseController
public AjaxResult edit(@Validated @RequestBody UUser user)
{
userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getUserId());
deptService.checkDeptDataScope(user.getDeptId());
roleService.checkRoleDataScope(user.getRoleIds());
// userService.checkUserDataScope(user.getUserId());
// deptService.checkDeptDataScope(user.getDeptId());
// roleService.checkRoleDataScope(user.getRoleIds());
if (!userService.checkUserNameUnique(user))
{
return error("修改用户'" + user.getUserName() + "'失败，登录账号已存在");

19
wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysUserController.java
View File

@@ -1,5 +1,6 @@
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;
@@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
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;
@@ -38,6 +40,8 @@ import org.wfc.system.service.ISysPermissionService;
import org.wfc.system.service.ISysPostService;
import org.wfc.system.service.ISysRoleService;
import org.wfc.system.service.ISysUserService;
import org.wfc.user.api.RemoteUUserService;
import org.wfc.user.api.domain.UUser;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
@@ -80,6 +84,9 @@ public class SysUserController extends BaseController
@Autowired
private MessageSource messageSource;
@Autowired
private RemoteUUserService remoteUUserService;
/**
* 测试国际化
*/
@@ -113,6 +120,18 @@ public class SysUserController extends BaseController
return getDataTable(list);
}
/**
* 获取用户平台-用户列表
*/
@GetMapping("/listUser")
public TableDataInfo listUser(UUser user)
{
startPage();
Page<Object> localPage = PageUtils.getLocalPage();
TableDataInfo result = remoteUUserService.page(localPage.getPageNum(), localPage.getPageSize(), user);
return result;
}
@Log(title = "用户管理", businessType = BusinessType.EXPORT)
@RequiresPermissions("system:user:export")
@PostMapping("/export")