From fb614b7b54591edb1ab1cc4cc3b1fcd2d6d9262b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 19 六月 2024 15:27:09 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinEnglish
---
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TSysSetController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TSysSetController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TSysSetController.java
index a5360b7..ded4896 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TSysSetController.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TSysSetController.java
@@ -62,6 +62,10 @@
public AjaxResult saveSysSet(SysSetVO vo) {
TSysSet byId = sysSetService.getById(1);
BeanUtils.copyProperties(vo, byId);
+ // 音效更改及更改音效设置时间
+ if (!byId.getCorrect().equals(vo.getCorrect()) || !byId.getError().equals(vo.getError())) {
+ byId.setAcousticsTime(new Date());
+ }
byId.setId(1);
sysSetService.updateById(byId);
return AjaxResult.success("保存成功");
@@ -147,13 +151,13 @@
@PostMapping("/agreement")
@ApiOperation(value = "协议", tags = {"后台-协议管理"})
- public AjaxResult agreement(@RequestBody AggrementDTO dto) {
+ public AjaxResult agreement(AggrementDTO dto) {
TProtocol protocol = protocolService.getById(dto.getType());
- if (StringUtils.hasLength(dto.getContent())) {
+ if (StringUtils.hasLength(dto.getContent())){
protocol.setContent(dto.getContent());
protocolService.updateById(protocol);
return AjaxResult.success("修改成功");
- } else {
+ }else {
return AjaxResult.success(protocol.getContent());
}
}
--
Gitblit v1.7.1