1、接口修复

blade-service-api/person-api/src/main/java/org/springblade/person/feign/HouseUserClientFallback.java

@@ -6,9 +6,11 @@ import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.person.dto.HouseUserDTO;
+import org.springblade.person.dto.MemberDTO;
 import org.springblade.person.entity.HouseUser;
 import org.springblade.person.vo.HouseUserVO;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
 import java.util.ArrayList;
@@ -118,7 +120,7 @@ public class HouseUserClientFallback implements IHouseUserClient {
 	}
 
 	@Override
-	public R<BladePage<HouseUserVO>> getPageByMember(HouseUserDTO houseUserDTO) {
+	public R<BladePage<HouseUserVO>> getPageByMember(MemberDTO memberDTO) {
 		return null;
 	}
 

blade-service-api/person-api/src/main/java/org/springblade/person/feign/IHouseUserClient.java

@@ -7,6 +7,7 @@ import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.person.dto.HouseUserDTO;
+import org.springblade.person.dto.MemberDTO;
 import org.springblade.person.entity.HouseUser;
 import org.springblade.person.vo.HouseUserVO;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -129,6 +130,6 @@ public interface IHouseUserClient {
 	List<HouseUserVO> getListByMember(@RequestParam(value = "memberId") Long memberId, @RequestParam(value = "residentialId", required = false) Long residentialId, @RequestParam(value = "roomId") Long roomId);
 
 	@PostMapping("/getPageByMember")
-	R<BladePage<HouseUserVO>> getPageByMember(@RequestBody HouseUserDTO houseUserDTO);
+	R<BladePage<HouseUserVO>> getPageByMember(@RequestBody MemberDTO memberDTO);
 
 }

blade-service/person/src/main/java/org/springblade/person/feign/HouseUserClient.java

@@ -18,6 +18,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.estate.feign.IApplyUserClient;
 import org.springblade.person.dto.HouseUserDTO;
+import org.springblade.person.dto.MemberDTO;
 import org.springblade.person.entity.HouseUser;
 import org.springblade.person.service.HouseUserService;
 import org.springblade.person.vo.HouseUserVO;
@@ -179,7 +180,7 @@ public class HouseUserClient implements IHouseUserClient {
 
 	@Override
 	@GetMapping("/getListByMember")
-	public List<HouseUserVO> getListByMember(@RequestParam(value = "memberId") Long memberId, @RequestParam(value = "residentialId", required = false) Long residentialId, @RequestParam(value = "roomId") Long roomId) {
+	public List<HouseUserVO> getListByMember(@RequestParam(value = "memberId") Long memberId, @RequestParam(value = "residentialId", required = false) Long residentialId, @RequestParam(value = "roomId", required = false) Long roomId) {
 		LambdaQueryWrapper<HouseUser> lambda = new LambdaQueryWrapper<>();
 		lambda.eq(HouseUser::getMemberId, memberId);
 		lambda.eq(residentialId != null, HouseUser::getResidentialId, residentialId);
@@ -199,8 +200,12 @@ public class HouseUserClient implements IHouseUserClient {
 
 	@Override
 	@PostMapping("/getPageByMember")
-	public R<BladePage<HouseUserVO>> getPageByMember(@RequestBody HouseUserDTO houseUserDTO) {
-		IPage<HouseUser> houseUserIPage = this.houseUserService.page(Condition.getPage(houseUserDTO.getQuery()), Condition.getQueryWrapper(houseUserDTO));
+	public R<BladePage<HouseUserVO>> getPageByMember(@RequestBody MemberDTO memberDTO) {
+		LambdaQueryWrapper<HouseUser> lambda = new LambdaQueryWrapper<>();
+		lambda.eq(HouseUser::getMemberId, memberDTO.getId());
+		lambda.eq(memberDTO.getResidentialId() != null, HouseUser::getResidentialId, memberDTO.getResidentialId());
+		lambda.eq(memberDTO.getRoomId() != null, HouseUser::getRoomId, memberDTO.getRoomId());
+		IPage<HouseUser> houseUserIPage = this.houseUserService.page(Condition.getPage(memberDTO.getQuery()), lambda);
 		IPage<HouseUserVO> houseUserVOIPage = HouseUserWrapper.build().pageVO(houseUserIPage);
 		return R.data(BladePage.of(houseUserVOIPage));
 	}

community-app-gateway/src/main/java/org/springblade/app/controller/HouseUserController.java

@@ -255,10 +255,11 @@ public class HouseUserController {
 	 * 功能描述: 获取房屋成员 By  memberId
 	 */
 	@PostMapping(value = "/getRoomUserByMemberId")
-	public R<BladePage<HouseUserVO>> getRoomUserByMemberId(@RequestBody HouseUserDTO houseUserDTO) {
-		Assert.notNull(houseUserDTO.getResidentialId(), "小区必传");
-		Assert.notNull(houseUserDTO.getId(), "会员必传");
-		return houseUserClient.getPageByMember(houseUserDTO);
+	public R<BladePage<HouseUserVO>> getRoomUserByMemberId(@RequestBody MemberDTO memberDTO) {
+		Assert.notNull(memberDTO.getResidentialId(), "小区必传");
+		Assert.notNull(memberDTO.getId(), "会员必传");
+		Assert.notNull(memberDTO.getRoomId(), "房间必传");
+		return houseUserClient.getPageByMember(memberDTO);
 	}
 
 	/**