From a8f2080d05242914158e4fa57635ee53e89b38c7 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 05 十二月 2025 16:12:46 +0800
Subject: [PATCH] 小鹅通
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java
index b949daa..5d3a915 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java
@@ -922,12 +922,18 @@
crmBranchAreas = crmBranchAreaMapper.selectList(Wrappers.lambdaQuery(TCrmBranchArea.class)
.eq(TCrmBranchArea::getCityCode, query.getCityCode())
.eq(TCrmBranchArea::getAreaType, 2));
+ if(CollectionUtils.isEmpty(crmBranchAreas)){
+ return new PageInfo<>();
+ }
}
if(StringUtils.isNotEmpty(query.getProvinceCode())){
crmBranchAreas = crmBranchAreaMapper.selectList(Wrappers.lambdaQuery(TCrmBranchArea.class)
.eq(TCrmBranchArea::getProvinceCode, query.getProvinceCode())
.eq(TCrmBranchArea::getAreaType, 2));
+ if(CollectionUtils.isEmpty(crmBranchAreas)){
+ return new PageInfo<>();
+ }
}
if(!CollectionUtils.isEmpty(crmBranchAreas)){
List<String> branchIds = crmBranchAreas.stream().map(TCrmBranchArea::getBranchId).collect(Collectors.toList());
@@ -938,8 +944,6 @@
}
List<String> ids = crmClinics.stream().map(TCrmClinic::getId).collect(Collectors.toList());
clinicIds.addAll(ids);
- }else {
- return new PageInfo<>();
}
if(StringUtils.isNotBlank(query.getBranchName())){
--
Gitblit v1.7.1