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> list(@RequestBody ExternalAppFormDTO formDTO) { - PageData page = externalAppService.listPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getCustomerId()); + PageData page = externalAppService.listPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getCustomerId(), formDTO.getCustomerType()); return new Result>().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 { ExternalAppResultDTO getByNameAndCustomerId(@Param("appName") String appName, @Param("customerId") String customerId); - List list(@Param("customerId") String customerId); + List list(@Param("customerId") String customerId, @Param("customerType") String customerType); List 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 listPage(Integer pageNo, Integer pageSize, String customerId); + PageData listPage(Integer pageNo, Integer pageSize, String customerId, String customerType); List 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 listPage(Integer pageNo, Integer pageSize, String customerId) { + public PageData listPage(Integer pageNo, Integer pageSize, String customerId, String customerType) { PageHelper.startPage(pageNo, pageSize); - List list = externalAppDao.list(customerId); + List 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 @@ AND ea.CUSTOMER_ID = #{customerId} + + AND ea.CUSTOMER_TYPE = #{customerType} +