From 3f3a1ed182e96214e66f6456ee692427bf04d454 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 28 十一月 2025 11:10:23 +0800
Subject: [PATCH] yys 1.库存管理导出修改 2.来票登记分页查询修改
---
src/main/java/com/ruoyi/project/system/controller/SysUserController.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysUserController.java b/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
index aa787ed..4ddd819 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
@@ -5,6 +5,7 @@
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.project.system.domain.vo.SysUserDeptVo;
+import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.project.system.service.*;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -65,6 +66,17 @@
startPage();
List<SysUser> list = userService.selectUserList(user);
return getDataTable(list);
+ }
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:user:list')")
+ @GetMapping("/listAll")
+ public AjaxResult listAll(SysUser user)
+ {
+ List<SysUser> list = userService.selectUserList(user);
+ return AjaxResult.success(list);
}
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.EXPORT)
@@ -269,4 +281,18 @@
List<SysUser> sysUserList = userService.userListNoPage(user);
return AjaxResult.success(sysUserList);
}
+
+ /**
+ * 鏌ヨ褰撳墠鐢ㄦ埛鍏徃涓嬫墍鏈夌敤鎴�
+ * @param user
+ * @return
+ */
+ @GetMapping("/userListNoPageByTenantId")
+ public AjaxResult userListNoPageByTenantId(SysUser user){
+ //鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅
+ SysUser loginUser = SecurityUtils.getLoginUser().getUser();
+ user.setTenantId(loginUser.getTenantId());
+ List<SysUser> sysUserList = userService.userListNoPage(user);
+ return AjaxResult.success(sysUserList);
+ }
}
--
Gitblit v1.9.3