From 368d903a1d72e78c0654e17f3424383d09b3e90f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E5=87=A1=E5=87=A1?= <hello@itcast.cn>
Date: Thu, 31 Mar 2022 17:34:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java |  6 ------
 src/main/java/com/pms/ocp/model/dto/TenantDto.java  | 12 ++++++++++--
 src/main/resources/mapper/OcpGroup.xml              |  4 ++++
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java b/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java
index d27e540..d295444 100644
--- a/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java
+++ b/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java
@@ -78,13 +78,7 @@ public class ApiBaseDto implements Serializable {
 
     private List<String> apiGroupCodeList;
 
-    public Integer getApiPromotion() {
-        return apiPromotion;
-    }
 
-    public void setApiPromotion(Integer apiPromotion) {
-        this.apiPromotion = apiPromotion;
-    }
 
     public String getApiCode() {
         return apiCode;
diff --git a/src/main/java/com/pms/ocp/model/dto/TenantDto.java b/src/main/java/com/pms/ocp/model/dto/TenantDto.java
index 85123a4..a469911 100644
--- a/src/main/java/com/pms/ocp/model/dto/TenantDto.java
+++ b/src/main/java/com/pms/ocp/model/dto/TenantDto.java
@@ -33,8 +33,8 @@ public class TenantDto implements Serializable {
     @ApiModelProperty("建设单位")
     private String tenantUnit;
 
-//    @ApiModelProperty("推广类型0:统建；1:自建")
-//    private Integer apiPromotion;
+    @ApiModelProperty("推广类型0:统建；1:自建")
+    private Integer tenantPromotion;
 
     @ApiModelProperty("注册时段-开始")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -165,4 +165,12 @@ public class TenantDto implements Serializable {
     public void setCurrentPage(Integer currentPage) {
         this.currentPage = currentPage;
     }
+
+    public Integer getTenantPromotion() {
+        return tenantPromotion;
+    }
+
+    public void setTenantPromotion(Integer tenantPromotion) {
+        this.tenantPromotion = tenantPromotion;
+    }
 }
diff --git a/src/main/resources/mapper/OcpGroup.xml b/src/main/resources/mapper/OcpGroup.xml
index 337e9d8..89bef1d 100644
--- a/src/main/resources/mapper/OcpGroup.xml
+++ b/src/main/resources/mapper/OcpGroup.xml
@@ -51,6 +51,10 @@
             and otb.tenant_unit = #{tenantUnit}
         </if>
 
+        <if test="tenantPromotion !=null ">
+            and otb.tenant_promotion = #{tenantPromotion}
+        </if>
+
         <if test="startCTime !=null  ">
             <![CDATA[
                 and otb.tenant_ctime >= #{startCTime}
-- 
2.26.0