From 5a78896bd818f0fb037f0b725b451647318129c9 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 12 Aug 2021 17:26:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E9=83=A8=E5=BA=94=E7=94=A8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E5=86=85=E5=A4=96=E9=83=A8=E5=AE=A2=E6=88=B7=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E8=BF=9B=E8=A1=8C=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/controller/ExternalAppController.java | 2 +-
 .../src/main/java/com/epmet/dao/ExternalAppDao.java           | 2 +-
 .../src/main/java/com/epmet/service/ExternalAppService.java   | 2 +-
 .../java/com/epmet/service/impl/ExternalAppServiceImpl.java   | 4 ++--
 .../src/main/resources/mapper/ExternalAppDao.xml              | 3 +++
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ExternalAppController.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ExternalAppController.java
index baee81af67..c0cacc525d 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ExternalAppController.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ExternalAppController.java
@@ -103,7 +103,7 @@ public class ExternalAppController {
      */
     @PostMapping("/list")
     public Result<PageData<ExternalAppResultDTO>> list(@RequestBody ExternalAppFormDTO formDTO) {
-        PageData<ExternalAppResultDTO> page = externalAppService.listPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getCustomerId());
+        PageData<ExternalAppResultDTO> page = externalAppService.listPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getCustomerId(), formDTO.getCustomerType());
         return new Result<PageData<ExternalAppResultDTO>>().ok(page);
     }
 
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/ExternalAppDao.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/ExternalAppDao.java
index b2f89b9b90..2139245165 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/ExternalAppDao.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/dao/ExternalAppDao.java
@@ -39,7 +39,7 @@ public interface ExternalAppDao extends BaseDao<ExternalAppEntity> {
 
     ExternalAppResultDTO getByNameAndCustomerId(@Param("appName") String appName, @Param("customerId") String customerId);
 
-    List<ExternalAppResultDTO> list(@Param("customerId") String customerId);
+    List<ExternalAppResultDTO> list(@Param("customerId") String customerId, @Param("customerType") String customerType);
 
     List<String> getCustomerIds();
 
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ExternalAppService.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ExternalAppService.java
index 77e4c32f48..b32ef9467e 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ExternalAppService.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/ExternalAppService.java
@@ -35,7 +35,7 @@ public interface ExternalAppService {
 
     ExternalAppResultDTO updateById(String appId, String appName, String customerId, String customerType);
 
-    PageData<ExternalAppResultDTO> listPage(Integer pageNo, Integer pageSize, String customerId);
+    PageData<ExternalAppResultDTO> listPage(Integer pageNo, Integer pageSize, String customerId, String customerType);
 
     List<String> getCustomerIds();
 
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ExternalAppServiceImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ExternalAppServiceImpl.java
index 9d7fee1483..12f84f3456 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ExternalAppServiceImpl.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ExternalAppServiceImpl.java
@@ -158,9 +158,9 @@ public class ExternalAppServiceImpl implements ExternalAppService {
     }
 
     @Override
-    public PageData<ExternalAppResultDTO> listPage(Integer pageNo, Integer pageSize, String customerId) {
+    public PageData<ExternalAppResultDTO> listPage(Integer pageNo, Integer pageSize, String customerId, String customerType) {
         PageHelper.startPage(pageNo, pageSize);
-        List<ExternalAppResultDTO> list = externalAppDao.list(customerId);
+        List<ExternalAppResultDTO> list = externalAppDao.list(customerId, customerType);
         for (ExternalAppResultDTO app : list) {
             // 设置客户类型中文
             app.setCustomerTypeName(CustomerTypeEnum.getName(app.getCustomerType()));
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/ExternalAppDao.xml b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/ExternalAppDao.xml
index 55889d71b1..fbc74db7ff 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/ExternalAppDao.xml
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/mapper/ExternalAppDao.xml
@@ -45,6 +45,9 @@
             <if test="customerId != null and customerId != ''">
                 AND ea.CUSTOMER_ID = #{customerId}
             </if>
+            <if test="customerType != null and customerType != ''">
+                AND ea.CUSTOMER_TYPE = #{customerType}
+            </if>
         </where>
     </select>