From 61046f00aa8d504372a0fd6f26334846c4ba33dc Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期五, 25 十一月 2022 15:52:21 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into haucheng_panzhihua
---
flower_city/src/main/java/com/dg/core/controller/SysSettingsController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/SysSettingsController.java b/flower_city/src/main/java/com/dg/core/controller/SysSettingsController.java
index b21df19..e5caf6b 100644
--- a/flower_city/src/main/java/com/dg/core/controller/SysSettingsController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/SysSettingsController.java
@@ -44,9 +44,12 @@
@ApiOperation(value = "修改设置信息",response = AutomessageSysSettings.class)
@PostMapping("/update")
@Authorization
- ResultData update(@RequestBody AutomessageSysSettings automessageSysSettings,@CurrentUser SysUser sysUser){
- automessageSysSettings.setUpdateUserId(sysUser.getUserId().intValue());
+ public ResultData update(@RequestBody AutomessageSysSettings automessageSysSettings,@CurrentUser SysUser sysUser){
+ automessageSysSettings.setUpdateUserId(sysUser.getUserId());
automessageSysSettings.setUpdateTime(LocalDateTime.now());
+ if (automessageSysSettings.getTimeoutRemindNum()>(automessageSysSettings.getTimeoutNotificationNum()*60)){
+ return ResultData.error("系统提醒时间不能大于系统通知时间*60");
+ }
return sysSettingsService.update(automessageSysSettings);
}
--
Gitblit v1.7.1