From 6c741ac9e80353ca42906c1c6c7109324ae9f9f9 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 03 十月 2024 01:02:38 +0800
Subject: [PATCH] 修改bug和翻译
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java
index 9baf926..54b8855 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java
@@ -82,8 +82,10 @@
*/
@RequestMapping("/user")
public String userIndex(Model model) {
- TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("type", 3));
+ TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("useType",1).eq("type", 3).eq("language",1));
model.addAttribute("one",one);
+ TAgreement two = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("useType",2).eq("type", 3).eq("language",1));
+ model.addAttribute("two",two);
return PREFIX + "tAgreementUser.html";
}
@@ -155,8 +157,10 @@
*/
@RequestMapping("/showCommonProblem")
public String showCommonProblem(Model model) {
- TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("type", 12));
+ TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("useType",1).eq("type", 12).eq("language",1));
model.addAttribute("one",one);
+ TAgreement two = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("useType",2).eq("type", 12).eq("language",1));
+ model.addAttribute("two",two);
return PREFIX + "commonProblem.html";
}
@@ -217,12 +221,24 @@
*/
@RequestMapping(value = "/updateAppParam")
@ResponseBody
- public Object updateAppParam(@RequestParam Integer id,@RequestParam String context) {
+ public Object updateAppParam(@RequestParam Integer id,@RequestParam String context, Integer id1, String context1) {
TAgreement agreement = tAgreementService.selectById(id);
- agreement.setContent(context);
- agreement.setUpdateTime(new Date());
- agreement.setUpdateUser(ShiroKit.getUser().getId());
- tAgreementService.updateById(agreement);
+ if (agreement!=null){
+ agreement.setContent(context);
+ agreement.setUpdateTime(new Date());
+ agreement.setUpdateUser(ShiroKit.getUser().getId());
+ tAgreementService.updateById(agreement);
+ }
+
+
+ TAgreement agreement1 = tAgreementService.selectById(id1);
+ if (agreement1!=null){
+ agreement1.setContent(context1);
+ agreement1.setUpdateTime(new Date());
+ agreement1.setUpdateUser(ShiroKit.getUser().getId());
+ tAgreementService.updateById(agreement1);
+ }
+
return SUCCESS_TIP;
}
--
Gitblit v1.7.1