From 8f9845717f6989792e2a6003adf5fe12ff0a9540 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 23 十一月 2022 16:14:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/SysSettingsController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 44091bd..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){
+ 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