From 20ba7096daaf223675029b9562a827ef531cba21 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 17 May 2022 20:02:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=87=AA=E5=B7=B1=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rent/service/impl/RentContractInfoServiceImpl.java      | 6 ++++++
 1 file 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 684e42f..9f67d66 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
@@ -96,12 +96,15 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
         String lesseeName = (String) params.get("lesseeName");
         String lesseeIdCard = (String) params.get("lesseeIdCard");
         String lesseeMobile = (String) params.get("lesseeMobile");
+        String createdBy = (String) params.get("createdBy");
         String startTime = (String) params.get("startTime");
         String endTime = (String) params.get("endTime");
 
         String endDate = (String) params.get("endDate");
         String customerId = (String) params.get("customerId");
 
+        String dataFlag = (String) params.get("dataFlag");
+
         QueryWrapper<RentContractInfoEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
         wrapper.eq(StringUtils.isNotBlank(gridId), "GRID_ID", gridId);
@@ -116,10 +119,13 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
         wrapper.eq(StringUtils.isNotBlank(lesseeName), "LESSEE_NAME", lesseeName);
         wrapper.eq(StringUtils.isNotBlank(lesseeIdCard), "LESSEE_ID_CARD", lesseeIdCard);
         wrapper.eq(StringUtils.isNotBlank(lesseeMobile), "LESSEE_MOBILE", lesseeMobile);
+        wrapper.eq(StringUtils.isNotBlank(createdBy), "CREATED_BY", createdBy);
 
         wrapper.eq(StringUtils.isNotBlank(endDate), "END_DATE", endDate);
         wrapper.eq(StringUtils.isNotBlank(customerId), "CUSTOMER_ID", customerId);
 
+        wrapper.eq(StringUtils.isNotBlank(dataFlag), "CREATED_BY", loginUserUtil.getLoginUserId());
+
         return wrapper;
     }