From a9837f2e06d05786cf6415e1e37a6205f928370a Mon Sep 17 00:00:00 2001
From: diaoruifeng <18351522362@163.com>
Date: Sun, 13 Mar 2022 11:46:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=88=97=E8=A1=A8=E6=A0=91?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/pms/ocp/model/dto/ApiBaseDto.java     | 25 ++++++++++++++++++-
 .../impl/ApiBasicManagementServiceImpl.java   |  1 +
 .../resources/mapper/OcpApiGroupMapper.xml    |  8 ++++--
 3 files changed, 31 insertions(+), 3 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 a26de17..42e0292 100644
--- a/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java
+++ b/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java
@@ -10,6 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.sql.Timestamp;
+import java.util.List;
 
 @Data
 @AllArgsConstructor
@@ -23,9 +24,12 @@ public class ApiBaseDto implements Serializable {
     @ApiModelProperty("服务分类编码")
     private String apiGroupCode;
 
-    @ApiModelProperty("服务分类公司(建设单位)")
+    @ApiModelProperty("服务分类公司()")
     private String apiGroupCompanyCode;
 
+    @ApiModelProperty("建设单位")
+    private String apiUnit;
+
     @ApiModelProperty("推广类型0:统建；1:自建")
     private Integer apiPromotion;
 
@@ -54,6 +58,9 @@ public class ApiBaseDto implements Serializable {
     @ApiModelProperty("每页条数")
     private Integer pageSize;
 
+
+    private List<String> apiGroupCodeList;
+
     public Integer getApiPromotion() {
         return apiPromotion;
     }
@@ -141,4 +148,20 @@ public class ApiBaseDto implements Serializable {
     public void setApiGroupCompanyCode(String apiGroupCompanyCode) {
         this.apiGroupCompanyCode = apiGroupCompanyCode;
     }
+
+    public String getApiUnit() {
+        return apiUnit;
+    }
+
+    public void setApiUnit(String apiUnit) {
+        this.apiUnit = apiUnit;
+    }
+
+    public List<String> getApiGroupCodeList() {
+        return apiGroupCodeList;
+    }
+
+    public void setApiGroupCodeList(List<String> apiGroupCodeList) {
+        this.apiGroupCodeList = apiGroupCodeList;
+    }
 }
diff --git a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java
index 2e0643c..baa197e 100644
--- a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java
@@ -197,6 +197,7 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
         apiGroupCode.add(apiBaseReq.getApiGroupCode());
         setGroupIdValue(apiBaseReq.getApiGroupCompanyCode() ,apiBaseReq.getApiGroupCode(),apiBaseReq.getApiPromotion());
         PageHelper.startPage(apiBaseReq.getPageNum(),apiBaseReq.getPageSize());
+        apiBaseReq.setApiGroupCodeList(apiGroupCode);
         List<OcpApiBaseVo> ocpApiBaseVos = ocpApiGroupMapper.selectPageLists(apiBaseReq);
         apiGroupCode.clear();
         PageInfo<OcpApiBaseVo> pageInfo = new PageInfo<>(ocpApiBaseVos);
diff --git a/src/main/resources/mapper/OcpApiGroupMapper.xml b/src/main/resources/mapper/OcpApiGroupMapper.xml
index f848409..d498501 100644
--- a/src/main/resources/mapper/OcpApiGroupMapper.xml
+++ b/src/main/resources/mapper/OcpApiGroupMapper.xml
@@ -55,8 +55,12 @@
         LEFT JOIN ocp_api_extent oae
         on oab.api_code = oae.api_code
         where oab.is_delete = 0
-        <if test="apiGroupCode !=null and apiGroupCode!=''">
-            and  oab.api_group_code = #{apiGroupCode}
+        <if test="apiGroupCodeList !=null ">
+            and  oab.api_group_code in
+            <foreach item="apiGroupCode" collection="apiGroupCodeList" open="(" separator=","
+                     close=")">
+                #{apiGroupCode}
+            </foreach>
         </if>
         <if test="apiUnit !=null and apiUnit!=''">
             and  oab.api_unit = #{apiUnit}
-- 
2.26.0