From 8a28bb397d5743edf1da5930db0d6d0fdd86b35e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 24 Nov 2023 18:10:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java b/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java
index 1da4a90..5cbb1c8 100644
--- a/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java
+++ b/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java
@@ -25,6 +25,8 @@
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.util.List;
+
 /**
  * 物业公司 服务实现类
  *
@@ -34,10 +36,25 @@
 @Service
 public class PropertyCompanyServiceImpl extends ServiceImpl<PropertyCompanyMapper, PropertyCompanyEntity> implements IPropertyCompanyService {
 
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param propertyCompany
+	 * @return
+	 */
 	@Override
 	public IPage<PropertyCompanyVO> selectPropertyCompanyPage(IPage<PropertyCompanyVO> page, PropertyCompanyVO propertyCompany) {
 		return page.setRecords(baseMapper.selectPropertyCompanyPage(page, propertyCompany));
 	}
 
-
+	/**
+	 * 物业公司列表查询(不分页)
+	 * @param propertyCompany
+	 * @return
+	 */
+	@Override
+	public List<PropertyCompanyVO> getPropertyCompanyList(PropertyCompanyVO propertyCompany) {
+		return baseMapper.getPropertyCompanyList(propertyCompany);
+	}
 }

--
Gitblit v1.9.3