From a3cd7414796b738244c93c4f27ee69483ff5ea69 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Sat, 22 Apr 2023 16:41:36 +0800 Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E7=BB=B4=E6=8A=A4=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/controller/mailGather/EmailMaintainController.java | 1 + .../core/service/mailGather/impl/EmailMaintainServiceImpl.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java index d5027fe9..866fe548 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java +++ b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java @@ -261,6 +261,7 @@ public class EmailMaintainController extends AbstractController { if(StringUtils.isEmpty(userCode)){ return ResponseEntity.ok(R.error("数据不能为空！")); } + DynamicContextHolder.push(DbConstant.BASICS_READ); String userName = emailMaintainService.getUserName(userCode); if(StringUtils.isNotEmpty(userName)){ JSONObject json = new JSONObject(); diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java index c5839165..cfca00b3 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson.JSONObject; import com.dxhy.common.constant.DbConstant; import com.dxhy.common.datasource.config.DynamicContextHolder; +import com.dxhy.common.utils.Base64Encoding; import com.dxhy.core.dao.mailGather.EmailMaintainDao; import com.dxhy.core.model.mailGather.EmailMaintainVo; import com.dxhy.core.service.mailGather.EmailMaintainService; @@ -54,6 +55,7 @@ public class EmailMaintainServiceImpl implements EmailMaintainService { for (int i = 0; i < emailMaintainVos.size(); i++) { EmailMaintainVo emailMaintainVo = emailMaintainVos.get(i); emailMaintainVo.setXh(i + 1 + ""); + emailMaintainVo.setEmailPassword(Base64Encoding.decodeToString(emailMaintainVo.getEmailPassword())); } } PageInfo pageInfo = new PageInfo<>(emailMaintainVos);