From 3af9c82375df6bd77ae78a5d900c409a895ecd18 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 14 十一月 2024 17:10:16 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java
index a3ccf8f..7ea069f 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java
@@ -6,6 +6,7 @@
import com.stylefeng.guns.modular.system.dao.PhoneMapper;
import com.stylefeng.guns.modular.system.model.Company;
import com.stylefeng.guns.modular.system.model.Phone;
+import com.stylefeng.guns.modular.system.service.ICompanyCityService;
import com.stylefeng.guns.modular.system.service.ICompanyService;
import com.stylefeng.guns.modular.system.service.IPhoneService;
import com.stylefeng.guns.modular.system.util.GoogleMap.AddressComponentsVo;
@@ -25,9 +26,9 @@
@Resource
private PhoneMapper phoneMapper;
-
- @Resource
- private CompanyMapper companyMapper;
+
+ @Autowired
+ private ICompanyCityService companyCityService;
/**
* 获取所有系统电话
@@ -72,10 +73,10 @@
//平台电话
Phone query = phoneMapper.query(2, 1, null, null, null);
map.put("platform", null != query ? query.getPhone() : "");
-
- List<Company> companies = companyMapper.queryList(city, null);
- if(companies.size() > 0){
- Integer id = companies.get(0).getId();
+
+ Company companies = companyCityService.query(city);
+ if(null != companies){
+ Integer id = companies.getId();
Phone phone = this.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", id));
map.put("company", phone.getPhone());
phone = this.selectOne(new EntityWrapper<Phone>().eq("type", 3).eq("companyId", id));
--
Gitblit v1.7.1