From 8522e469e00e1cf6c0410165b0f76c806c13ca83 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 16 八月 2025 09:17:04 +0800
Subject: [PATCH] 合并代码
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java
index 82848b5..37dcf1d 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java
@@ -25,6 +25,7 @@
@Autowired
private IOpenCityService openCityService;
+
/**
* 获取所有系统电话
* @return
@@ -33,7 +34,7 @@
@Override
public List<Phone> queryPhones(String code) throws Exception {
OpenCity openCity = openCityService.openCity1(code);
- return phoneMapper.selectList(new EntityWrapper<Phone>().eq("openCityId", openCity));
+ return phoneMapper.selectList(new EntityWrapper<Phone>().eq("openCityId", openCity.getId()));
}
@@ -47,9 +48,9 @@
public Map<String, Object> queryCustomerPhone(String code) throws Exception {
Map<String, Object> map = new HashMap<>();
OpenCity openCity = openCityService.openCity1(code);
- Phone phone = this.selectOne(new EntityWrapper<Phone>().eq("openCityId", openCity).eq("type", 2).eq("platform", 1));
+ Phone phone = this.selectOne(new EntityWrapper<Phone>().eq("openCityId", openCity.getId()).eq("type", 2).eq("platform", 1));
map.put("platform", null != phone ? phone.getPhone() : "");
- phone = this.selectOne(new EntityWrapper<Phone>().eq("openCityId", openCity).eq("type", 2).eq("platform", 2));
+ phone = this.selectOne(new EntityWrapper<Phone>().eq("openCityId", openCity.getId()).eq("type", 2).eq("platform", 2));
map.put("company", null != phone ? phone.getPhone() : "");
return map;
}
--
Gitblit v1.7.1