From 0d7e86e15745d5b42c5c8285f9ef8628aa3e79a0 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Fri, 13 May 2022 18:41:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=A2=E6=88=B7=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rent/service/impl/RentBlacklistServiceImpl.java       | 4 ++++
 .../rent/service/impl/RentContractInfoServiceImpl.java    | 4 ++++
 .../modules/rent/service/impl/RentHouseServiceImpl.java   | 8 ++++++++
 .../rent/service/impl/RentTenantInfoServiceImpl.java      | 5 +++++
 .../main/resources/mapper/rent/RentContractInfoDao.xml    | 3 +++
 .../src/main/resources/mapper/rent/RentTenantInfoDao.xml  | 3 +++
 6 files changed, 27 insertions(+)

diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentBlacklistServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentBlacklistServiceImpl.java
index a1c4e79..bca0d53 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentBlacklistServiceImpl.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentBlacklistServiceImpl.java
@@ -47,6 +47,7 @@ public class RentBlacklistServiceImpl extends BaseServiceImpl<RentBlacklistDao,
 
     @Override
     public PageData<RentBlacklistDTO> page(Map<String, Object> params) {
+        params.put("customerId", loginUserUtil.getLoginUserCustomerId());
         IPage<RentBlacklistEntity> page = baseDao.selectPage(
                 getPage(params, FieldConstant.CREATED_TIME, false),
                 getWrapper(params)
@@ -56,6 +57,7 @@ public class RentBlacklistServiceImpl extends BaseServiceImpl<RentBlacklistDao,
 
     @Override
     public List<RentBlacklistDTO> list(Map<String, Object> params) {
+        params.put("customerId", loginUserUtil.getLoginUserCustomerId());
         List<RentBlacklistEntity> entityList = baseDao.selectList(getWrapper(params));
 
         return ConvertUtils.sourceToTarget(entityList, RentBlacklistDTO.class);
@@ -68,6 +70,7 @@ public class RentBlacklistServiceImpl extends BaseServiceImpl<RentBlacklistDao,
         String mobile = (String) params.get("mobile");
         String startTime = (String) params.get("startTime");
         String endTime = (String) params.get("endTime");
+        String customerId = (String) params.get("customerId");
 
         QueryWrapper<RentBlacklistEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -76,6 +79,7 @@ public class RentBlacklistServiceImpl extends BaseServiceImpl<RentBlacklistDao,
         wrapper.eq(StringUtils.isNotBlank(mobile), "MOBILE", mobile);
         wrapper.ge(StringUtils.isNotBlank(startTime), "JOIN_DATE", startTime);
         wrapper.le(StringUtils.isNotBlank(endTime), "JOIN_DATE", endTime);
+        wrapper.eq(StringUtils.isNotBlank(customerId), "CUSTOMER_ID", customerId);
 
         return wrapper;
     }
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java
index 322eee4..36f0698 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java
@@ -68,6 +68,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
 
     @Override
     public PageData<RentContractInfoDTO> page(Map<String, Object> params) {
+        params.put("customerId", loginUserUtil.getLoginUserCustomerId());
         IPage<RentContractInfoDTO> page = getPage(params);
         List<RentContractInfoDTO> list = baseDao.getContractInfoList(params);
         return new PageData<>(list, page.getTotal());
@@ -75,6 +76,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
 
     @Override
     public List<RentContractInfoDTO> list(Map<String, Object> params) {
+        params.put("customerId", loginUserUtil.getLoginUserCustomerId());
         List<RentContractInfoEntity> entityList = baseDao.selectList(getWrapper(params));
 
         return ConvertUtils.sourceToTarget(entityList, RentContractInfoDTO.class);
@@ -98,6 +100,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
         String endTime = (String) params.get("endTime");
 
         String endDate = (String) params.get("endDate");
+        String customerId = (String) params.get("customerId");
 
         QueryWrapper<RentContractInfoEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -115,6 +118,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
         wrapper.eq(StringUtils.isNotBlank(lesseeMobile), "LESSEE_MOBILE", lesseeMobile);
 
         wrapper.eq(StringUtils.isNotBlank(endDate), "END_DATE", endDate);
+        wrapper.eq(StringUtils.isNotBlank(customerId), "CUSTOMER_ID", customerId);
 
         return wrapper;
     }
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentHouseServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentHouseServiceImpl.java
index d945038..60e3d30 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentHouseServiceImpl.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentHouseServiceImpl.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dto.form.IcHouseAddFormDTO;
 import com.epmet.feign.GovOrgOpenFeignClient;
@@ -37,8 +38,12 @@ public class RentHouseServiceImpl extends BaseServiceImpl<RentHouseDao, RentHous
     @Autowired
     private GovOrgOpenFeignClient govOrgOpenFeignClient;
 
+    @Autowired
+    private LoginUserUtil loginUserUtil;
+
     @Override
     public PageData<RentHouseDTO> page(Map<String, Object> params) {
+        params.put("customerId", loginUserUtil.getLoginUserCustomerId());
         IPage<RentHouseEntity> page = baseDao.selectPage(
                 getPage(params, FieldConstant.CREATED_TIME, false),
                 getWrapper(params)
@@ -48,6 +53,7 @@ public class RentHouseServiceImpl extends BaseServiceImpl<RentHouseDao, RentHous
 
     @Override
     public List<RentHouseDTO> list(Map<String, Object> params) {
+        params.put("customerId", loginUserUtil.getLoginUserCustomerId());
         List<RentHouseEntity> entityList = baseDao.selectList(getWrapper(params));
 
         return ConvertUtils.sourceToTarget(entityList, RentHouseDTO.class);
@@ -66,6 +72,7 @@ public class RentHouseServiceImpl extends BaseServiceImpl<RentHouseDao, RentHous
         String rentFlag = (String) params.get("rentFlag");
         String startTime = (String) params.get("startTime");
         String endTime = (String) params.get("endTime");
+        String customerId = (String) params.get("customerId");
 
         QueryWrapper<RentHouseEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -80,6 +87,7 @@ public class RentHouseServiceImpl extends BaseServiceImpl<RentHouseDao, RentHous
         wrapper.eq(StringUtils.isNotBlank(rentFlag), "RENT_FLAG", rentFlag);
         wrapper.ge(StringUtils.isNotBlank(startTime), "PURCHASE_DATE", startTime);
         wrapper.le(StringUtils.isNotBlank(endTime), "PURCHASE_DATE", endTime);
+        wrapper.eq(StringUtils.isNotBlank(customerId), "CUSTOMER_ID", customerId);
 
         return wrapper;
     }
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentTenantInfoServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentTenantInfoServiceImpl.java
index 314bb9f..d8d4bc4 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentTenantInfoServiceImpl.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentTenantInfoServiceImpl.java
@@ -50,6 +50,7 @@ public class RentTenantInfoServiceImpl extends BaseServiceImpl<RentTenantInfoDao
 
     @Override
     public PageData<RentTenantInfoDTO> page(Map<String, Object> params) {
+        params.put("customerId", loginUserUtil.getLoginUserCustomerId());
         IPage<RentTenantInfoEntity> page = baseDao.selectPage(
                 getPage(params, FieldConstant.CREATED_TIME, false),
                 getWrapper(params)
@@ -59,6 +60,7 @@ public class RentTenantInfoServiceImpl extends BaseServiceImpl<RentTenantInfoDao
 
     @Override
     public PageData<RentTenantInfoDTO> page4Landlord(Map<String, Object> params) {
+        params.put("customerId", loginUserUtil.getLoginUserCustomerId());
         IPage<RentTenantInfoDTO> page = getPage(params);
         List<RentTenantInfoDTO> list = baseDao.getLandlordList(params);
         return new PageData<>(list, page.getTotal());
@@ -66,6 +68,7 @@ public class RentTenantInfoServiceImpl extends BaseServiceImpl<RentTenantInfoDao
 
     @Override
     public List<RentTenantInfoDTO> list(Map<String, Object> params) {
+        params.put("customerId", loginUserUtil.getLoginUserCustomerId());
         List<RentTenantInfoEntity> entityList = baseDao.selectList(getWrapper(params));
 
         return ConvertUtils.sourceToTarget(entityList, RentTenantInfoDTO.class);
@@ -77,6 +80,7 @@ public class RentTenantInfoServiceImpl extends BaseServiceImpl<RentTenantInfoDao
         String idCard = (String) params.get("idCard");
         String type = (String) params.get("type");
         String state = (String) params.get("state");
+        String customerId = (String) params.get("customerId");
 
         QueryWrapper<RentTenantInfoEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -84,6 +88,7 @@ public class RentTenantInfoServiceImpl extends BaseServiceImpl<RentTenantInfoDao
         wrapper.eq(StringUtils.isNotBlank(idCard), "ID_CARD", idCard);
         wrapper.eq(StringUtils.isNotBlank(type), "TYPE", type);
         wrapper.eq(StringUtils.isNotBlank(state), "STATE", state);
+        wrapper.eq(StringUtils.isNotBlank(customerId), "CUSTOMER_ID", customerId);
 
         return wrapper;
     }
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentContractInfoDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentContractInfoDao.xml
index 820b9bb..f7e75d2 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentContractInfoDao.xml
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentContractInfoDao.xml
@@ -43,6 +43,9 @@
         LEFT JOIN pli_rent_blacklist b ON i.LESSEE_ID_CARD = b.ID_CARD AND b.DEL_FLAG = '0'
         WHERE
         i.DEL_FLAG = '0'
+        <if test="customerId != null and customerId != ''">
+            AND i.CUSTOMER_ID = #{customerId}
+        </if>
         <if test="gridId != null and gridId != ''">
             AND i.GRID_ID = #{gridId}
         </if>
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentTenantInfoDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentTenantInfoDao.xml
index 6c16af5..fdd7959 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentTenantInfoDao.xml
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentTenantInfoDao.xml
@@ -50,6 +50,9 @@
         WHERE
         DEL_FLAG = '0'
         AND TYPE = '0'
+        <if test="customerId != null and customerId != ''">
+            AND CUSTOMER_ID = #{customerId}
+        </if>
         <if test="state != null and state != ''">
             AND STATE = #{state}
         </if>