bug修改

无关风月

2025-04-16 58b9f4d4521b21f0dbd2ed717cfa35e92d02a527

bug修改

 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();

 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;

 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;
    }