From 792259bdf5c4616d51f2e1902e96aa14417ac63b 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 16:12:32 +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

---
 .../java/com/pms/ocp/mapper/OcpApiGroupMapper.java |  2 +-
 .../java/com/pms/ocp/model/vo/OcpApiBaseVo.java    |  6 +++---
 .../impl/ApiBasicManagementServiceImpl.java        |  6 +++++-
 src/main/resources/mapper/OcpApiGroupMapper.xml    | 14 ++++++--------
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiGroupMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiGroupMapper.java
index 0f374e7..7d34893 100644
--- a/src/main/java/com/pms/ocp/mapper/OcpApiGroupMapper.java
+++ b/src/main/java/com/pms/ocp/mapper/OcpApiGroupMapper.java
@@ -23,7 +23,7 @@ public interface OcpApiGroupMapper extends BaseMapper<OcpApiGroup> {
 
     List<OcpApiBaseVo> selectPageLists(ApiBaseDto apiBaseReq);
 
-    List<OcpGroupBaseDto> apiTree(String apiGroupCompanyCode, String apiGroupPcode, Integer apiGroupPromotionType);
+    List<OcpGroupBaseDto> apiTree(OcpApiBaseVo  ocpApiBaseVo);
 
     List<OcpGroupBaseDto> selectBase(String apiGroupCompanyCode, String apiGroupPcode,Integer apiGroupPromotionType);
 
diff --git a/src/main/java/com/pms/ocp/model/vo/OcpApiBaseVo.java b/src/main/java/com/pms/ocp/model/vo/OcpApiBaseVo.java
index f248489..702e5c7 100644
--- a/src/main/java/com/pms/ocp/model/vo/OcpApiBaseVo.java
+++ b/src/main/java/com/pms/ocp/model/vo/OcpApiBaseVo.java
@@ -108,7 +108,7 @@ public class OcpApiBaseVo implements Serializable {
     private String apiGroupName;
 
     @ApiModelProperty("推广类型0统推，1自建")
-    private long apiGroupPromotionType;
+    private Integer apiGroupPromotionType;
 
     @ApiModelProperty("分类所属公司")
     private String apiGroupCompanyCode;
@@ -312,11 +312,11 @@ public class OcpApiBaseVo implements Serializable {
         this.apiGroupName = apiGroupName;
     }
 
-    public long getApiGroupPromotionType() {
+    public Integer getApiGroupPromotionType() {
         return apiGroupPromotionType;
     }
 
-    public void setApiGroupPromotionType(long apiGroupPromotionType) {
+    public void setApiGroupPromotionType(Integer apiGroupPromotionType) {
         this.apiGroupPromotionType = apiGroupPromotionType;
     }
 
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 51672ed..3e379f6 100644
--- a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java
@@ -156,7 +156,11 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
 
     @Override
     public List<OcpGroupBaseDto> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode, Integer apiGroupPromotionType, String apiCode) {
-        List<OcpGroupBaseDto> ocpApiGroups = ocpApiGroupMapper.apiTree(apiGroupCompanyCode, apiGroupPcode, apiGroupPromotionType);
+        OcpApiBaseVo  ocpApiBaseVo = new OcpApiBaseVo();
+        ocpApiBaseVo.setApiGroupCompanyCode(apiGroupCompanyCode);
+        ocpApiBaseVo.setApiGroupPcode(apiGroupPcode);
+        ocpApiBaseVo.setApiGroupPromotionType(apiGroupPromotionType);
+        List<OcpGroupBaseDto> ocpApiGroups = ocpApiGroupMapper.apiTree(ocpApiBaseVo);
         if (ocpApiGroups.size() != 0) {
             return ocpApiGroups;
         } else {
diff --git a/src/main/resources/mapper/OcpApiGroupMapper.xml b/src/main/resources/mapper/OcpApiGroupMapper.xml
index 8225888..eef60e4 100644
--- a/src/main/resources/mapper/OcpApiGroupMapper.xml
+++ b/src/main/resources/mapper/OcpApiGroupMapper.xml
@@ -50,22 +50,20 @@
     </select>
 
 
-    <select id="apiTree" resultType="com.pms.ocp.model.dto.OcpGroupBaseDto">
+    <select id="apiTree" resultType="com.pms.ocp.model.dto.OcpGroupBaseDto" parameterType="com.pms.ocp.model.vo.OcpApiBaseVo">
         select api_group_code,api_group_name as apiName,api_group_pcode,api_group_level from ocp_api_group where is_delete = 0
-
-        <if test="apiGroupPcode == null ">
-            and api_group_pcode is null or api_group_pcode =''
-        </if>
         <if test="apiGroupPcode!=null and apiGroupPcode!=''">
             and api_group_pcode = #{apiGroupPcode}
         </if>
         <if test="apiGroupCompanyCode!=null and apiGroupCompanyCode!=''">
             and api_group_company_code =#{apiGroupCompanyCode}
         </if>
-        <if test="apiGroupPromotionType!=null and apiGroupPromotionType!=''">
-            and api_group_promotion_type =#{apiGroupPromotionType}
+        <if test="apiGroupPromotionType !=null">
+        and api_group_promotion_type =#{apiGroupPromotionType}
+        </if>
+        <if test="apiGroupPcode == null ">
+            and (api_group_pcode is null or api_group_pcode ='')
         </if>
-
     </select>
 
 
-- 
2.26.0