From 6cb4ebd3c59e585d546a3e66672fb7f3029a06f3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 16 四月 2025 15:44:11 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminAgreementController.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminAgreementController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminAgreementController.java
index e076a00..58e49de 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminAgreementController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminAgreementController.java
@@ -69,18 +69,17 @@
@ResponseBody
public Object save(THuiminAgreement tHuiminAgreement) {
tHuiminAgreement.setObjectType(UserExt.getUser().getObjectType());
- String agreementSettings = tHuiminAgreement.getAgreementSettings();
- List<THuiminAgreementSetting> tHuiminAgreementSettings = JSONArray.parseArray(agreementSettings, THuiminAgreementSetting.class);
- tHuiminAgreement.setSettingList(tHuiminAgreementSettings);
+
huiminAgreementClient.insert(tHuiminAgreement);
return SUCCESS_TIP;
}
@RequestMapping(value = "/selectAgreementByOperationId")
@ResponseBody
public ResultUtil<THuiminAgreement> selectAgreementByOperationId(Integer operatorId) {
+ Integer objectType = UserExt.getUser().getObjectType();
HuiminAgreementQuery huiminAgreementQuery = new HuiminAgreementQuery();
huiminAgreementQuery.setOperatorId(operatorId);
- huiminAgreementQuery.setObjectType(Objects.isNull(operatorId) ? 1 : 2);
+ huiminAgreementQuery.setObjectType(objectType);
THuiminAgreement huiminAgreement = huiminAgreementClient.selectByObjectType(huiminAgreementQuery);
return ResultUtil.success(huiminAgreement);
}
--
Gitblit v1.7.1