From f6fd3607f046744e86f391956d91d0f009bb3adb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 18 八月 2025 22:50:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java
index d8c87a5..36d87d7 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java
@@ -49,7 +49,8 @@
*/
@Override
public Company query(String code) throws Exception {
- if(code.equals(""))code="370500";
+// if(code.equals(""))code="370500";
+ if (code == null)code="370500";
String province = code.substring(0, 2) + "0000";
String city = code.substring(0, 4) + "00";
List<Company> query = companyMapper.query(province, city, code);
@@ -68,4 +69,17 @@
}
return null;
}
+ /**
+ * 根据行政编号获取所属企业
+ * @param code
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public List<Company> queryCall(String code) throws Exception {
+ String province = code.substring(0, 2) + "0000";
+ String city = code.substring(0, 4) + "00";
+ List<Company> query = companyMapper.query(province, city, code);
+ return query;
+ }
}
--
Gitblit v1.7.1