From e2ff7924b35d7866d68482a9e3a7f4dd238ea043 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Wed, 18 May 2022 15:53:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AA=E6=9F=A5=E8=AF=A2=E8=87=AA=E5=B7=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/rent/service/impl/RentContractInfoServiceImpl.java | 3 +++
 .../src/main/resources/mapper/rent/RentContractInfoDao.xml     | 3 +++
 2 files changed, 6 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/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 1c60953..9b22c46 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
@@ -69,6 +69,9 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
     @Override
     public PageData<RentContractInfoDTO> page(Map<String, Object> params) {
         params.put("customerId", loginUserUtil.getLoginUserCustomerId());
+        if (StringUtils.isNotBlank((String) params.get("dataFlag"))) {
+            params.put("createdBy", loginUserUtil.getLoginUserId());
+        }
         IPage<RentContractInfoDTO> page = getPage(params);
         List<RentContractInfoDTO> list = baseDao.getContractInfoList(params);
         return new PageData<>(list, page.getTotal());
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 1ab3135..3c7f712 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
@@ -95,6 +95,9 @@
         <if test="endTime != null and endTime != ''">
             AND i.SIGN_DATE &lt;= #{endTime}
         </if>
+        <if test="createdBy != null and createdBy != ''">
+            AND i.CREATED_BY = #{createdBy}
+        </if>
         <if test="endDate != null and endDate != ''">
             <if test="endDate == '0' or endDate == 0">
                 AND DATE( i.END_DATE ) &lt;= DATE_ADD( curdate(), INTERVAL 1 MONTH )