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<CeesUserMapper, CeesUser> 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<CeesWaiTeacherMapper,
 
         Page<CeesWaiTeacher> page = new Page<>(pageNo, pageSize);
         IPage<CeesWaiTeacher> 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<String> dormitoryIdList = pageList.getRecords().stream().map(CeesWaiTeacher::getDormitoryId).collect(Collectors.toSet());
         if (dormitoryIdList.size() > 0) {
             LambdaQueryWrapper<CeesDormitoryInfo> dormitoryWrapper = Wrappers.lambdaQuery(CeesDormitoryInfo.class).in(CeesDormitoryInfo::getId, dormitoryIdList);