|
|
|
|
@ -210,8 +210,14 @@ public class WorkBenchesController extends BladeController { |
|
|
|
|
*/ |
|
|
|
|
@GetMapping("/mapAddress") |
|
|
|
|
public R<Map<String, Object>> mapAddress(String perType) { |
|
|
|
|
BladeUser bladeUser = AuthUtil.getUser(); |
|
|
|
|
List<User> 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<String, Object> map = new HashMap<>(); |
|
|
|
|
List<User> users = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getStatus, 1).isNotNull(User::getAddressLon).isNotNull(User::getDeptName)); |
|
|
|
|
for (User user : users) { |
|
|
|
|
List<String> fault = new ArrayList<>(); |
|
|
|
|
fault.add(user.getAddressLon()); |
|
|
|
|
|