From afa0dbb4f54e7244835dd67ec33c3e545f122f71 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 17 一月 2025 16:40:43 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/AgreementServiceImpl.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/AgreementServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/AgreementServiceImpl.java
index 6277b7b..0cdf996 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/AgreementServiceImpl.java
+++ b/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());
// 保存或更新协议
--
Gitblit v1.7.1