From 1c40baaf9ca0183945b9881d11ceed5aeebc8290 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 23 十月 2025 11:35:44 +0800
Subject: [PATCH] 修改bug
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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..268d46c 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.dao.PhoneMapper;
import com.stylefeng.guns.modular.system.model.OpenCity;
import com.stylefeng.guns.modular.system.model.Phone;
@@ -11,9 +12,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@Service
@@ -25,6 +24,7 @@
@Autowired
private IOpenCityService openCityService;
+
/**
* 获取所有系统电话
* @return
@@ -32,8 +32,11 @@
*/
@Override
public List<Phone> queryPhones(String code) throws Exception {
- OpenCity openCity = openCityService.openCity1(code);
- return phoneMapper.selectList(new EntityWrapper<Phone>().eq("openCityId", openCity));
+ if(ToolUtil.isNotEmpty(code)){
+ OpenCity openCity = openCityService.openCity1(code);
+ return phoneMapper.selectList(new EntityWrapper<Phone>().eq("openCityId", openCity.getId()));
+ }
+ return new ArrayList<>();
}
@@ -47,9 +50,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