From 58b9f4d4521b21f0dbd2ed717cfa35e92d02a527 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 16 四月 2025 09:28:01 +0800
Subject: [PATCH] bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminAgreementController.java | 4 +---
cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminAgreement.java | 3 +++
cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminAgreementController.java | 4 ++++
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminAgreementController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminAgreementController.java
index e51555f..59dc754 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminAgreementController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminAgreementController.java
@@ -1,6 +1,7 @@
package com.dsh.activity.controller;
import cn.hutool.core.collection.CollUtil;
+import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.dsh.activity.entity.THuiminAgreement;
import com.dsh.activity.entity.THuiminAgreementSetting;
@@ -69,6 +70,9 @@
@PostMapping("/base/tHuiminAgreement/save")
@Transactional(rollbackFor = Exception.class)
public void insert(@RequestBody THuiminAgreement tHuiminAgreement){
+ String agreementSettings = tHuiminAgreement.getAgreementSettings();
+ List<THuiminAgreementSetting> tHuiminAgreementSettings = JSONArray.parseArray(agreementSettings, THuiminAgreementSetting.class);
+ tHuiminAgreement.setSettingList(tHuiminAgreementSettings);
Integer operatorId = tHuiminAgreement.getOperatorId();
//如果是平台账号，需要设置operatorId为null
List<THuiminAgreementSetting> tHuiminAgreementSettingList = tHuiminAgreement.getSettingList();
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminAgreement.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminAgreement.java
index bdc037f..c392e2c 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminAgreement.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminAgreement.java
@@ -40,6 +40,7 @@
@ApiModelProperty("运营商id")
private Integer operatorId;
+
/**
*添加人员说明文案
*/
@@ -61,6 +62,8 @@
@TableField(exist = false)
private Integer objectType;
+ @TableField(exist = false)
+ private String agreementSettings;
@TableField(exist = false)
private List<THuiminAgreementSetting> settingList;
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 f3c3549..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,9 +69,7 @@
@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;
}
--
Gitblit v1.7.1