From 0e6658f37144940fccba7d2f5c3e06ad891eee5a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 17 九月 2025 15:19:09 +0800
Subject: [PATCH] 新增加司机选择所属企业接口
---
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
index dacaf57..4131178 100644
--- a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
+++ b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
@@ -1219,17 +1219,17 @@
List<CompanyCity> areaCode = companyCityService.selectList(new EntityWrapper<CompanyCity>().eq("areaCode", districtCode));
companyId = areaCode.stream().map(CompanyCity::getCompanyId).collect(Collectors.toList());
}
- if(ToolUtil.isNotEmpty(cityCode) && (null == companyId ||companyId.isEmpty())){
+ if(ToolUtil.isNotEmpty(cityCode) && (null == companyId || companyId.isEmpty())){
List<CompanyCity> areaCode = companyCityService.selectList(new EntityWrapper<CompanyCity>().eq("cityCode", cityCode).isNull("areaCode"));
companyId = areaCode.stream().map(CompanyCity::getCompanyId).collect(Collectors.toList());
}
- if(ToolUtil.isNotEmpty(provinceCode) && (null == companyId ||companyId.isEmpty())){
+ if(ToolUtil.isNotEmpty(provinceCode) && (null == companyId || companyId.isEmpty())){
List<CompanyCity> areaCode = companyCityService.selectList(new EntityWrapper<CompanyCity>().eq("provinceCode", provinceCode).isNull("cityCode").isNull("areaCode"));
companyId = areaCode.stream().map(CompanyCity::getCompanyId).collect(Collectors.toList());
}
if(null != companyId && !companyId.isEmpty()){
List<Company> companies = companyService.selectBatchIds(companyId);
- List<Map<String, Object>> collect = companies.stream().map(s -> {
+ List<Map<String, Object>> collect = companies.stream().filter(s->0 == s.getState() && 3 != s.getFlag()).map(s -> {
Map<String, Object> map = new HashMap<>();
map.put("id", s.getId());
map.put("name", s.getName());
--
Gitblit v1.7.1