From 524357f43c5373a930a4ad1bed56032436679995 Mon Sep 17 00:00:00 2001 From: Qi <3194726156@qq.com> Date: Fri, 23 May 2025 20:58:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=AF=86=E5=A4=96=E6=A0=A1=E5=92=8C?= =?UTF-8?q?=E8=AF=84=E5=8D=B7=E5=9C=B0=E7=82=B9=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/service/impl/CeesUserServiceImpl.java | 2 +- .../service/impl/CeesWaiTeacherServiceImpl.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesUserServiceImpl.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesUserServiceImpl.java index 5fe4b9c9..ca02dda7 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesUserServiceImpl.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesUserServiceImpl.java @@ -296,7 +296,7 @@ public class CeesUserServiceImpl extends ServiceImpl i if (ceesGroupMapper.selectById(groupId).getName() == null) { return Result.ok("暂时未分组"); } else { - return Result.ok(ceesGroupMapper.selectById(groupId).getName()); + return Result.ok(ceesGroupMapper.selectById(groupId)); } } diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesWaiTeacherServiceImpl.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesWaiTeacherServiceImpl.java index f3f82e9e..65fee2d4 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesWaiTeacherServiceImpl.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesWaiTeacherServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -129,6 +130,15 @@ public class CeesWaiTeacherServiceImpl extends ServiceImpl page = new Page<>(pageNo, pageSize); IPage pageList = page(page, queryWrapper); + // 对流中的每个对象进行解密处理 + pageList.getRecords().forEach(teacher -> { + if (StringUtils.isNotBlank(teacher.getIdentityId())) { + teacher.setIdentityId(JasyptUtil.decrypt(teacher.getIdentityId(),passWord)); + } + if (StringUtils.isNotBlank(teacher.getPyCard())) { + teacher.setPyCard(JasyptUtil.decrypt(teacher.getPyCard(),passWord)); + } + }); Set dormitoryIdList = pageList.getRecords().stream().map(CeesWaiTeacher::getDormitoryId).collect(Collectors.toSet()); if (dormitoryIdList.size() > 0) { LambdaQueryWrapper dormitoryWrapper = Wrappers.lambdaQuery(CeesDormitoryInfo.class).in(CeesDormitoryInfo::getId, dormitoryIdList);