SH-Arbitrate/Arbitrate-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'qtz3' of SH-Arbitrate/Arbitrate-Backend into dev

Browse Source
This commit was merged in pull request #295.
This commit is contained in:
qtz
2023-12-09 15:38:14 +08:00
committed by Gitea
parent 65dbeb9bdc 6f80764866
commit 69b5b0d072
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-admin/src/main/resources/application-druid.yml
+1 -1
View File
@@ -6,7 +6,7 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: master:
url: jdbc:mysql://121.40.189.20:3306/test_smart_arbitration?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&serverTimezone=Asia/Shanghai&useSSL=false url: jdbc:mysql://121.40.189.20:3306/test_smart_arbitration?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai&useSSL=false
username: root username: root
password: YMzc157# password: YMzc157#
# 从库数据源 # 从库数据源
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+3 -2
View File
@@ -2593,8 +2593,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
@Transactional @Transactional
public AjaxResult editCaseApplicationDefineval(CaseApplication caseApplication) { public AjaxResult editCaseApplicationDefineval(CaseApplication caseApplication) {
if(CollectionUtil.isNotEmpty(caseApplication.getColumnValues())) { if(CollectionUtil.isNotEmpty(caseApplication.getColumnValues())) {
// 修改自定义字段 for (ColumnValue columnValue : caseApplication.getColumnValues()) {
columnValueMapper.batchUpdate(caseApplication.getColumnValues()); columnValueMapper.updateColumnValue(columnValue);
}
} }
return success(); return success();
} }