|
@@ -103,6 +103,8 @@ public class SysUserController {
|
|
@Autowired
|
|
@Autowired
|
|
private ISysRoleService roleService;
|
|
private ISysRoleService roleService;
|
|
|
|
|
|
|
|
+ @Resource
|
|
|
|
+ private UserCompanyMapper userCompanyMapper;
|
|
@Autowired
|
|
@Autowired
|
|
private RedisUtil redisUtil;
|
|
private RedisUtil redisUtil;
|
|
@Value("${jeecg.path.upload}")
|
|
@Value("${jeecg.path.upload}")
|
|
@@ -118,14 +120,22 @@ public class SysUserController {
|
|
public Map<String, Object> getAllDesigner() {
|
|
public Map<String, Object> getAllDesigner() {
|
|
Map<String, Object> map = new HashMap<>();
|
|
Map<String, Object> map = new HashMap<>();
|
|
List<SysUser> userList = sysUserService.getAllDesigner();
|
|
List<SysUser> userList = sysUserService.getAllDesigner();
|
|
- map.put("data",userList);
|
|
|
|
|
|
+ map.put("data", userList);
|
|
ResultMapUtils.setResultMap(map, StatusCode.COMMON_SUCCESS);
|
|
ResultMapUtils.setResultMap(map, StatusCode.COMMON_SUCCESS);
|
|
return map;
|
|
return map;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @RequestMapping(value = "/getAllUser", method = RequestMethod.GET)
|
|
|
|
+ public Result<Object> getAllUser() {
|
|
|
|
+ try {
|
|
|
|
+ List<SysUserVo> allUser = sysUserService.getAllUser(null);
|
|
|
|
+ return Result.ok(allUser);
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ e.printStackTrace();
|
|
|
|
+ }
|
|
|
|
+ return Result.error("查询失败");
|
|
|
|
+ }
|
|
|
|
|
|
- @Resource
|
|
|
|
- private UserCompanyMapper userCompanyMapper;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
* 获取用户列表数据
|
|
* 获取用户列表数据
|
|
@@ -138,6 +148,21 @@ public class SysUserController {
|
|
*/
|
|
*/
|
|
@PermissionData(pageComponent = "system/UserList")
|
|
@PermissionData(pageComponent = "system/UserList")
|
|
@RequestMapping(value = "/list", method = RequestMethod.GET)
|
|
@RequestMapping(value = "/list", method = RequestMethod.GET)
|
|
|
|
+ public Result<Object> queryPageList(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
|
|
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
|
|
|
|
+ try {
|
|
|
|
+ PageHelper.startPage(pageNo, pageSize);
|
|
|
|
+ List<SysUser> list = sysUserService.queryPageList(user);
|
|
|
|
+ PageInfo<SysUser> pageInfo = new PageInfo<>(list);
|
|
|
|
+ return Result.ok(pageInfo);
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ log.error("获取用户列表数据-分页列表查询异常", e);
|
|
|
|
+ }
|
|
|
|
+ return Result.error("查询失败");
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /* @PermissionData(pageComponent = "system/UserList")
|
|
|
|
+ @RequestMapping(value = "/list", method = RequestMethod.GET)
|
|
public Result<IPage<SysUser>> queryPageList(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
public Result<IPage<SysUser>> queryPageList(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
|
|
Result<IPage<SysUser>> result = new Result<>();
|
|
Result<IPage<SysUser>> result = new Result<>();
|
|
@@ -161,7 +186,7 @@ public class SysUserController {
|
|
result.setResult(pageList);
|
|
result.setResult(pageList);
|
|
log.info(pageList.toString());
|
|
log.info(pageList.toString());
|
|
return result;
|
|
return result;
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
|
|
|
|
@RequestMapping(value = "/getAllUserListByCompany", method = RequestMethod.GET)
|
|
@RequestMapping(value = "/getAllUserListByCompany", method = RequestMethod.GET)
|
|
public Result<List<SysUserVo>> getAllUserListByCompany(String userName) {
|
|
public Result<List<SysUserVo>> getAllUserListByCompany(String userName) {
|