Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-04-01 8444084e6aa11efa23287e7f82474ac22378a5c4

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/AgreementServiceImpl.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.domain.dto.AppAgreementDto;
import com.ruoyi.system.domain.dto.MgtAgreementEditDto;
@@ -13,6 +14,8 @@
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.nio.charset.StandardCharsets;
import java.util.Base64;
import java.util.Date;

/**
@@ -42,6 +45,12 @@
        if(appAgreementVo==null){
            throw new ServiceException(AppErrorConstant.AGREEMENT_FAILED);
        }
        /*String agreementContent = appAgreementVo.getAgreementContent();
        if(StringUtils.isNotBlank(agreementContent)){
            byte[] decodedBytes = Base64.getDecoder().decode(agreementContent);
            agreementContent = new String(decodedBytes, StandardCharsets.UTF_8);
            appAgreementVo.setAgreementContent(agreementContent);
        }*/
        return appAgreementVo;
    }

@@ -65,7 +74,12 @@
        }
        // 更新协议内容和创建者信息
        agreement.setAgreementType(mgtAgreementEditDto.getAgreementType());
        agreement.setAgreementContent(mgtAgreementEditDto.getAgreementContent());
        String agreementContent = mgtAgreementEditDto.getAgreementContent();
        if(StringUtils.isNotBlank(agreementContent)){
            byte[] decodedBytes = Base64.getDecoder().decode(agreementContent);
            agreementContent = new String(decodedBytes, StandardCharsets.UTF_8);
            agreement.setAgreementContent(agreementContent);
        }
        agreement.setCreateUserId(mgtAgreementEditDto.getUserId());
        agreement.setCreateTime(new Date());
        // 保存或更新协议