From 922e20756d584616b9435439ccb08bd94d914e83 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Fri, 5 Jan 2024 16:42:11 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8):=2079935?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LawsStandardizationServiceImpl.java | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java index 9e5ce002..fab40f97 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; +import com.jero.common.util.PasswordUtil; import com.jero.common.util.SnowflakeUtils; import com.jero.modules.laws.dataCenter.entity.LawsDataCenterFile; import com.jero.modules.laws.dataCenter.service.ILawsDataCenterFileService; @@ -421,24 +422,15 @@ public class LawsStandardizationServiceImpl extends ServiceImpl sysDeparts = sysDepartService.queryUserDeparts(sysUser.getId()); - if (CollectionUtils.isNotEmpty(sysDeparts)){ - String departNames = sysDeparts.stream().map(SysDepart::getDepartName).collect(Collectors.joining(",")); - lawsStandardizationGroup.setDepartment(departNames); - } + List sysDeparts = sysDepartService.queryUserDeparts(sysUser.getId()); + if (CollectionUtils.isNotEmpty(sysDeparts)){ + String departNames = sysDeparts.stream().map(SysDepart::getDepartName).collect(Collectors.joining(",")); + lawsStandardizationGroup.setDepartment(departNames); } // 电话 - if (StringUtils.isBlank(lawsStandardizationGroup.getPhone()) - && StringUtils.isNotBlank(sysUser.getPhone())){ - lawsStandardizationGroup.setPhone(sysUser.getPhone()); - } + lawsStandardizationGroup.setPhone(PasswordUtil.decrypt(sysUser.getPhone())); // 邮箱 - if (StringUtils.isBlank(lawsStandardizationGroup.getMailbox()) - && StringUtils.isNotBlank(sysUser.getEmail())){ - lawsStandardizationGroup.setMailbox(sysUser.getEmail()); - } + lawsStandardizationGroup.setMailbox(PasswordUtil.decrypt(sysUser.getEmail())); } }