From af73b41c2b027d8d74ce417e2f10008337577128 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 29 十月 2025 14:07:06 +0800
Subject: [PATCH] 新增服务补偿，用户查询BUG修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 9979825..4a7f264 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -1,6 +1,8 @@
package com.ruoyi.web.controller.system;
+import com.github.pagehelper.PageInfo;
import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -9,6 +11,7 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -28,7 +31,9 @@
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -63,13 +68,24 @@
*/
//@PreAuthorize("@ss.hasPermi('system:user:list')")
@GetMapping("/list")
- public TableDataInfo list(SysUser user) {
- startPage();
+ public Map<String, Object> list(SysUser user) {
LoginUser loginUser = getLoginUser();
String orgid = loginUser.getUser().getOrgid();
user.setOrgid(orgid);
- List<SysUser> list = userService.selectUserList(user);
- return getDataTable(list);
+ user.setPageNum(PageUtils.getOffset(user.getPageNum(), user.getPageSize()));
+ List<SysUser> list = userService.getUserList(user);
+
+ Map<String, Object> rspData = new HashMap();
+ rspData.put("code", HttpStatus.SUCCESS);
+ rspData.put("msg", "鏌ヨ鎴愬姛");
+ rspData.put("rows", list);
+
+ user.setPageNum(null);
+ user.setPageSize(null);
+ List<SysUser> total = userService.getUserList(user);
+ rspData.put("total", total.size());
+
+ return rspData;
}
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.EXPORT)
@@ -104,7 +120,7 @@
//@PreAuthorize("@ss.hasPermi('system:user:query')")
@GetMapping("/getInfo/{userId}")
public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) {
- log.info("--------userId鐨勫�间负锛歿}",userId);
+ log.info("--------userId鐨勫�间负锛歿}", userId);
userService.checkUserDataScope(userId);
AjaxResult ajax = AjaxResult.success();
List<SysRole> roles = roleService.selectRoleAll();
@@ -123,7 +139,7 @@
sysUserDept.setDeptType("1");
LoginUser loginUser = getLoginUser();
SysUser user = loginUser.getUser();
- log.info("--------user鐨勫�间负锛歿}",user);
+ log.info("--------user鐨勫�间负锛歿}", user);
sysUserDept.setOrgid(user.getOrgid());
sysUserDeptKSs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
ajax.put("belongDepts", sysUserDeptKSs);
--
Gitblit v1.9.3