From bbb7a099205a07eaa4b7ec1fdcfc750f56942c42 Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Wed, 5 Feb 2025 09:18:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/contraller/WorkBenchesController.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/springblade/modules/business/contraller/WorkBenchesController.java b/src/main/java/org/springblade/modules/business/contraller/WorkBenchesController.java index a898258..8f84dcd 100644 --- a/src/main/java/org/springblade/modules/business/contraller/WorkBenchesController.java +++ b/src/main/java/org/springblade/modules/business/contraller/WorkBenchesController.java @@ -210,8 +210,14 @@ public class WorkBenchesController extends BladeController { */ @GetMapping("/mapAddress") public R> mapAddress(String perType) { + BladeUser bladeUser = AuthUtil.getUser(); + List users = null; + if (!bladeUser.getRoleName().contains("administrator") && !bladeUser.getRoleName().contains("admin")) { + users = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getStatus, 1).eq(User::getParentDeptId,bladeUser.getDeptId()).isNotNull(User::getAddressLon).isNotNull(User::getDeptName)); + }else{ + users = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getStatus, 1).isNotNull(User::getAddressLon).isNotNull(User::getDeptName)); + } Map map = new HashMap<>(); - List users = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getStatus, 1).isNotNull(User::getAddressLon).isNotNull(User::getDeptName)); for (User user : users) { List fault = new ArrayList<>(); fault.add(user.getAddressLon());