From e2d01b2009c30173ff8e9f77d5c065f4d38fa49d Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 17 五月 2024 17:56:07 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/AgreementServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/AgreementServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/AgreementServiceImpl.java
index 085a374..b0021e9 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/AgreementServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/AgreementServiceImpl.java
@@ -24,10 +24,13 @@
* @throws Exception
*/
@Override
- public String queryByType(Integer type) throws Exception {
- String s = agreementMapper.queryByType(type, 1);
+ public String queryByType(Integer type, Integer language) throws Exception {
+ if(null == language){
+ language = 2;
+ }
+ String s = agreementMapper.queryByType(type, language, 1);
if(ToolUtil.isEmpty(s)){
- s = agreementMapper.queryByType(type, null);
+ s = agreementMapper.queryByType(type, language, null);
}
return s;
}
--
Gitblit v1.7.1