From 796dc4887bfc37eb29e5ac6c4737e51ff7ab4299 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期一, 12 八月 2024 11:41:46 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 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 9e608f0..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
@@ -223,16 +223,22 @@
@ResponseBody
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);
- agreement1.setContent(context1);
- agreement1.setUpdateTime(new Date());
- agreement1.setUpdateUser(ShiroKit.getUser().getId());
- tAgreementService.updateById(agreement1);
+ 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