From 42a7552b9c8603aeab7f0785eb05270dfbeb0bd3 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期日, 02 三月 2025 10:16:20 +0800
Subject: [PATCH] Merge branch 'master' into dev
---
start/src/main/java/com/ycl/web/controller/system/SysUserController.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/start/src/main/java/com/ycl/web/controller/system/SysUserController.java b/start/src/main/java/com/ycl/web/controller/system/SysUserController.java
index 8ab3e24..f6580d6 100644
--- a/start/src/main/java/com/ycl/web/controller/system/SysUserController.java
+++ b/start/src/main/java/com/ycl/web/controller/system/SysUserController.java
@@ -63,6 +63,17 @@
return getDataTable(list);
}
+ /**
+ * 鑾峰彇鐢ㄦ埛鍒楄〃 鏃犳暟鎹潈闄�
+ */
+// @PreAuthorize("@ss.hasPermi('system:user:list')")
+ @GetMapping("/list/no-data-auth")
+ public TableDataInfo listNoAuth(SysUser user) {
+ startPage();
+ List<SysUser> list = userService.selectUserListNoAuth(user);
+ return getDataTable(list);
+ }
+
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:user:export')")
@PostMapping("/export")
@@ -224,6 +235,15 @@
}
/**
+ * 鑾峰彇閮ㄩ棬鏍戝垪琛� 鏃犳暟鎹潈闄�
+ */
+// @PreAuthorize("@ss.hasPermi('system:user:list')")
+ @GetMapping("/deptTree/no-data-auth")
+ public AjaxResult deptTreeNoDataAuth(SysDept dept) {
+ return success(deptService.deptTreeNoDataAuth(dept));
+ }
+
+ /**
* 鑾峰彇閮ㄩ棬鏍戝垪琛紝娴佺▼閰嶇疆浣跨敤
*/
// @PreAuthorize("@ss.hasPermi('system:user:list')")
@@ -231,4 +251,9 @@
public AjaxResult flowDeptTree(SysDept dept) {
return success(deptService.flowDeptTree(dept));
}
+
+ @GetMapping("/getByDept/{deptId}")
+ public AjaxResult getByDept(@PathVariable Long deptId) {
+ return success(userService.getByDept(deptId));
+ }
}
--
Gitblit v1.8.0