From 03f1f3372a10a08f96f3308bfa099e86a55046d0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 30 一月 2024 09:32:38 +0800
Subject: [PATCH] 修改数据权限bug
---
ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml | 8 ++++----
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java | 10 ++++++++++
ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml | 8 ++++----
ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml | 8 ++++----
ruoyi-modules/ruoyi-member/src/main/resources/bootstrap.yml | 8 ++++----
ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml | 10 +++++-----
6 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml
index e9669fd..19e0523 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-goods/src/main/resources/bootstrap.yml
@@ -17,9 +17,9 @@
server-addr: 47.109.78.184:5000
# server-addr: 127.0.0.1:8848
#pro
-# namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
+ namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
#test
- namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
+# namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
#dev
# namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
config:
@@ -27,9 +27,9 @@
server-addr: 47.109.78.184:5000
# server-addr: 127.0.0.1:8848
#pro
-# namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
+ namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
#test
- namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
+# namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
#dev
# namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
# 配置文件格式
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-member/src/main/resources/bootstrap.yml
index 231e41b..5b52107 100644
--- a/ruoyi-modules/ruoyi-member/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/bootstrap.yml
@@ -17,9 +17,9 @@
server-addr: 47.109.78.184:5000
# server-addr: 127.0.0.1:8848
#pro
-# namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
+ namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
#test
- namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
+# namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
#dev
# namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
config:
@@ -27,9 +27,9 @@
server-addr: 47.109.78.184:5000
# server-addr: 127.0.0.1:8848
#pro
-# namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
+ namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
#test
- namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
+# namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
#dev
# namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
# 配置文件格式
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml
index 2f68335..ed57718 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-order/src/main/resources/bootstrap.yml
@@ -17,9 +17,9 @@
server-addr: 47.109.78.184:5000
# server-addr: 127.0.0.1:8848
#pro
-# namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
+ namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
#test
- namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
+# namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
#dev
# namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
config:
@@ -27,9 +27,9 @@
server-addr: 47.109.78.184:5000
# server-addr: 127.0.0.1:8848
#pro
-# namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
+ namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
#test
- namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
+# namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
#dev
# namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
# 配置文件格式
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml
index 1d1c34d..93c2e40 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml
@@ -17,19 +17,19 @@
server-addr: 47.109.78.184:5000
# server-addr: 127.0.0.1:8848
#pro
-# namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
+ namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
#test
- namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
+# namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
#dev
# namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
config:
# 配置中心地址
server-addr: 47.109.78.184:5000
# server-addr: 127.0.0.1:8848
- #pro
-# namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
+# pro
+ namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
#test
- namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
+# namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
#dev
# namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
# 配置文件格式
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java
index ad3473e..1f499f6 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java
@@ -81,6 +81,16 @@
return R.ok(mgtDeptStaffListVoList);
}
+
+ @RequestMapping(value = "/listDeptStaff", method = RequestMethod.POST)
+ @ApiOperation(value = "获取所有部门员工列表")
+ public R<List<MgtDeptStaffListVo>> listDeptStaff() {
+ List<MgtDeptStaffListVo> mgtDeptStaffListVoList= sysStaffService.listMgtDeptStaff(null,null);
+ return R.ok(mgtDeptStaffListVoList);
+ }
+
+
+
@RequestMapping(value = "/listMgtDeptStaffByPermission", method = RequestMethod.POST)
@ApiOperation(value = "通过权限获取部门员工列表")
public R<List<MgtDeptStaffListVo>> listMgtDeptStaffByPermission() {
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
index bf3b5f5..fed2ac4 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
@@ -21,9 +21,9 @@
server-addr: 47.109.78.184:5000
# server-addr: 127.0.0.1:8848
#pro
-# namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
+ namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
#test
- namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
+# namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
#dev
# namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
config:
@@ -31,9 +31,9 @@
server-addr: 47.109.78.184:5000
# server-addr: 127.0.0.1:8848
#pro
-# namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
+ namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
#test
- namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
+# namespace: e1a7e419-e8c7-4d7d-8a0a-c00ab6ccfccd
#dev
# namespace: 6857cbd9-6088-4fe8-bb58-2b516d99876f
# 配置文件格式
--
Gitblit v1.7.1