From 4e85cf00c3a77b7165f4d349da21e94b2b528909 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 11 四月 2025 10:05:41 +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 | 12 +++---------
1 files changed, 3 insertions(+), 9 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 b4a0ba7..904c18b 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
@@ -60,7 +60,6 @@
THuiminAgreement huiminAgreement = huiminAgreementClient.selectByObjectType(huiminAgreementQuery);
model.addAttribute("objectType", objectType);
model.addAttribute("item", huiminAgreement);
- model.addAttribute("tHuiminAgreementSettingList", Objects.nonNull(huiminAgreement) ? JSONArray.toJSONString(huiminAgreement.getTHuiminAgreementSettingList()) : "");
//查询运营商列表
model.addAttribute("operatorList", operatorService.list(new QueryWrapper<TOperator>().eq("state", 1)));
model.addAttribute("operatorId", operatorId);
@@ -72,23 +71,18 @@
tHuiminAgreement.setObjectType(UserExt.getUser().getObjectType());
String agreementSettings = tHuiminAgreement.getAgreementSettings();
List<THuiminAgreementSetting> tHuiminAgreementSettings = JSONArray.parseArray(agreementSettings, THuiminAgreementSetting.class);
- tHuiminAgreement.setTHuiminAgreementSettingList(tHuiminAgreementSettings);
+ tHuiminAgreement.setSettingList(tHuiminAgreementSettings);
huiminAgreementClient.insert(tHuiminAgreement);
return SUCCESS_TIP;
}
@RequestMapping(value = "/selectAgreementByOperationId")
@ResponseBody
- public ResultUtil<String> selectAgreementByOperationId(Integer operatorId) {
- String tHuiminAgreementSettings = "";
+ public ResultUtil<THuiminAgreement> selectAgreementByOperationId(Integer operatorId) {
HuiminAgreementQuery huiminAgreementQuery = new HuiminAgreementQuery();
huiminAgreementQuery.setOperatorId(operatorId);
huiminAgreementQuery.setObjectType(Objects.isNull(operatorId) ? 1 : 2);
THuiminAgreement huiminAgreement = huiminAgreementClient.selectByObjectType(huiminAgreementQuery);
- if (Objects.nonNull(huiminAgreement)) {
- //查询协议配置
- tHuiminAgreementSettings = JSONArray.toJSONString(huiminAgreement.getTHuiminAgreementSettingList());
- }
- return ResultUtil.success(tHuiminAgreementSettings);
+ return ResultUtil.success(huiminAgreement);
}
/*
*//**
--
Gitblit v1.7.1