From 5fd47c20d64ec1b09a30cdaeef20c4ccbaad5376 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 26 Mar 2024 11:57:04 +0800
Subject: [PATCH] 用户名修改成住户名称

---
 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 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 5197b16..d246b0b 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
@@ -50,6 +50,7 @@
 import org.springblade.modules.grid.service.IGridmanService;
 import org.springblade.modules.house.entity.HouseholdEntity;
 import org.springblade.modules.house.service.IHouseholdService;
+import org.springblade.modules.house.vo.HouseholdVO;
 import org.springblade.modules.police.entity.PoliceAffairsGridEntity;
 import org.springblade.modules.police.service.IPoliceAffairsGridService;
 import org.springblade.modules.property.entity.PropertyCompanyEntity;
@@ -610,15 +611,32 @@
 		}
 	}
 
+	/**
+	 * 通过小区id查询物业人员
+	 *
+	 * @param districtId
+	 * @param building
+	 * @return
+	 */
 	@Override
 	public List<UserEntity> getUserInfoByDistrictId(String districtId, String building) {
 		return baseMapper.getUserInfoByDistrictId(districtId, building);
 	}
 
+	/**
+	 * 通过小区id查询用户
+	 *
+	 * @param districtIds
+	 * @param building
+	 * @param unit
+	 * @param name
+	 * @return
+	 */
 	@Override
-	public List<User> getUserInfoByDistrictIds(String districtIds) {
-		List<String> list = JSON.parseArray(districtIds).toJavaList(String.class);
-		return baseMapper.getUserInfoByDistrictIds(list);
+	public IPage<HouseholdVO> getUserInfoByDistrictIds(HouseholdVO householdVO, IPage<HouseholdVO> page) {
+		List<String> list = JSON.parseArray(householdVO.getDistrictIds()).toJavaList(String.class);
+		List<HouseholdVO> userInfoByDistrictIds = baseMapper.getUserInfoByDistrictIds(list, householdVO, page);
+		return page.setRecords(userInfoByDistrictIds);
 	}
 
 	/**

--
Gitblit v1.9.3