From 9cc50d2e2c3fcfff3c6b95c09806d3881a97c5ff Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 02 Jan 2024 15:20:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 9ca8d96..faf733c 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -495,7 +495,7 @@
@Override
public List<UserEntity> getUserInfoByCode(String houseCode, String type) {
- if (type.equals("1")) {
+ if (type.equals("0")) {
IGridmanService bean = SpringUtil.getBean(IGridmanService.class);
return bean.getGridManByCode(houseCode);
} else {
@@ -503,4 +503,9 @@
return bean1.getDistictUserByCode(houseCode);
}
}
+
+ @Override
+ public List<UserEntity> getUserInfoByDistrictId(String districtId, String building) {
+ return baseMapper.getUserInfoByDistrictId(districtId, building);
+ }
}
--
Gitblit v1.9.3