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());