From 9e28bdecf5dbce6fba22be1fcda4c60abe1d5ec3 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期四, 29 九月 2022 15:46:34 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/AreaCodeServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/AreaCodeServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/AreaCodeServiceImpl.java
index 01d7434..c2be340 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/AreaCodeServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/AreaCodeServiceImpl.java
@@ -40,7 +40,10 @@
areaCodes.add(organizationChartEntity.getVillage());
getAreaCodeIds(areaCodes,organizationChartEntity);
}
- return baseMapper.selectByIdSet(areaCodes);
+ if (areaCodes.size()==0)
+ return null;
+ else
+ return baseMapper.selectByIdSet(areaCodes);
}
public List<String> getAreaCodeIds(List<String> areaCodes, OrganizationChartEntity organizationChartEntity){
--
Gitblit v1.7.1