|
@@ -95,7 +95,7 @@ public class ComprehensiveQueryImpl implements IComprehensiveQuery {
|
|
|
ownerDto.setCommunityId(communityId);
|
|
ownerDto.setCommunityId(communityId);
|
|
|
ownerDto.setIdCard(searchValue);
|
|
ownerDto.setIdCard(searchValue);
|
|
|
ownerDto.setOwnerTypeCds(new String[]{OwnerDto.OWNER_TYPE_CD_MEMBER, OwnerDto.OWNER_TYPE_CD_RENTING});
|
|
ownerDto.setOwnerTypeCds(new String[]{OwnerDto.OWNER_TYPE_CD_MEMBER, OwnerDto.OWNER_TYPE_CD_RENTING});
|
|
|
- List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
|
|
|
|
|
|
|
+ List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
|
|
|
Assert.listOnlyOne(ownerDtos, "未找到成员信息或者查询到多条,请换其他条件查询");
|
|
Assert.listOnlyOne(ownerDtos, "未找到成员信息或者查询到多条,请换其他条件查询");
|
|
|
|
|
|
|
|
return queryByOwnerId(communityId, ownerDtos.get(0).getOwnerId());
|
|
return queryByOwnerId(communityId, ownerDtos.get(0).getOwnerId());
|
|
@@ -114,7 +114,7 @@ public class ComprehensiveQueryImpl implements IComprehensiveQuery {
|
|
|
ownerDto.setCommunityId(communityId);
|
|
ownerDto.setCommunityId(communityId);
|
|
|
ownerDto.setLink(searchValue);
|
|
ownerDto.setLink(searchValue);
|
|
|
ownerDto.setOwnerTypeCds(new String[]{OwnerDto.OWNER_TYPE_CD_MEMBER, OwnerDto.OWNER_TYPE_CD_RENTING});
|
|
ownerDto.setOwnerTypeCds(new String[]{OwnerDto.OWNER_TYPE_CD_MEMBER, OwnerDto.OWNER_TYPE_CD_RENTING});
|
|
|
- List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
|
|
|
|
|
|
|
+ List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
|
|
|
Assert.listOnlyOne(ownerDtos, "未找到成员信息或者查询到多条,请换其他条件查询");
|
|
Assert.listOnlyOne(ownerDtos, "未找到成员信息或者查询到多条,请换其他条件查询");
|
|
|
|
|
|
|
|
return queryByOwnerId(communityId, ownerDtos.get(0).getOwnerId());
|
|
return queryByOwnerId(communityId, ownerDtos.get(0).getOwnerId());
|
|
@@ -133,7 +133,7 @@ public class ComprehensiveQueryImpl implements IComprehensiveQuery {
|
|
|
ownerDto.setCommunityId(communityId);
|
|
ownerDto.setCommunityId(communityId);
|
|
|
ownerDto.setName(searchValue);
|
|
ownerDto.setName(searchValue);
|
|
|
ownerDto.setOwnerTypeCds(new String[]{OwnerDto.OWNER_TYPE_CD_MEMBER, OwnerDto.OWNER_TYPE_CD_RENTING});
|
|
ownerDto.setOwnerTypeCds(new String[]{OwnerDto.OWNER_TYPE_CD_MEMBER, OwnerDto.OWNER_TYPE_CD_RENTING});
|
|
|
- List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
|
|
|
|
|
|
|
+ List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
|
|
|
Assert.listOnlyOne(ownerDtos, "未找到成员信息或者查询到多条,请换其他条件查询");
|
|
Assert.listOnlyOne(ownerDtos, "未找到成员信息或者查询到多条,请换其他条件查询");
|
|
|
|
|
|
|
|
return queryByOwnerId(communityId, ownerDtos.get(0).getOwnerId());
|
|
return queryByOwnerId(communityId, ownerDtos.get(0).getOwnerId());
|