From 6b56c831cbd789bd560d2e0af665601f55e36d76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A5=9E=E7=A0=81-=E6=96=B9=E6=99=93=E8=BE=89?=
 <fangxh2013@qq.com>
Date: Tue, 3 Feb 2026 20:18:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=95=99=E8=82=B2?=
 =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

日志描述改为：学校 / 年级 / 班级 / 学科
---
 .../h5/service/impl/H5MemberServiceImpl.java  | 42 ++++++++++++++++++-
 1 file changed, 40 insertions(+), 2 deletions(-)

diff --git a/backend/ruoyi-modules/pangu-business/src/main/java/org/dromara/pangu/h5/service/impl/H5MemberServiceImpl.java b/backend/ruoyi-modules/pangu-business/src/main/java/org/dromara/pangu/h5/service/impl/H5MemberServiceImpl.java
index 5089380..2e5d88d 100644
--- a/backend/ruoyi-modules/pangu-business/src/main/java/org/dromara/pangu/h5/service/impl/H5MemberServiceImpl.java
+++ b/backend/ruoyi-modules/pangu-business/src/main/java/org/dromara/pangu/h5/service/impl/H5MemberServiceImpl.java
@@ -184,8 +184,9 @@ public class H5MemberServiceImpl implements H5MemberService {
         log.info("H5添加教育身份: memberId={}, educationId={}", memberId, education.getEducationId());
         
         // 记录操作日志
+        String logDesc = buildEducationLogDesc(dto, school);
         memberLogService.log(memberId, MemberOperType.EDU_ADD.getCode(),
-            MemberOperType.EDU_ADD.getTitle(), "学校：" + school.getSchoolName());
+            MemberOperType.EDU_ADD.getTitle(), logDesc);
     }
 
     @Override
@@ -212,8 +213,9 @@ public class H5MemberServiceImpl implements H5MemberService {
         log.info("H5修改教育身份: memberId={}, educationId={}", memberId, educationId);
         
         // 记录操作日志
+        String logDesc = buildEducationLogDesc(dto, school);
         memberLogService.log(memberId, MemberOperType.EDU_EDIT.getCode(),
-            MemberOperType.EDU_EDIT.getTitle(), "学校：" + school.getSchoolName());
+            MemberOperType.EDU_EDIT.getTitle(), logDesc);
     }
 
     @Override
@@ -285,6 +287,42 @@ public class H5MemberServiceImpl implements H5MemberService {
             MemberOperType.EDU_SWITCH.getTitle(), "切换默认教育身份");
     }
 
+    /**
+     * 构建教育身份日志描述
+     */
+    private String buildEducationLogDesc(H5EducationDto dto, PgSchool school) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(school.getSchoolName());
+        
+        // 获取年级名称
+        PgSchoolGrade schoolGrade = schoolGradeMapper.selectById(dto.getSchoolGradeId());
+        if (schoolGrade != null && schoolGrade.getGradeId() != null) {
+            PgGrade grade = gradeMapper.selectById(schoolGrade.getGradeId());
+            if (grade != null) {
+                sb.append(" / ").append(grade.getGradeName());
+            }
+        }
+        
+        // 获取班级名称
+        PgSchoolClass schoolClass = schoolClassMapper.selectById(dto.getSchoolClassId());
+        if (schoolClass != null && schoolClass.getClassId() != null) {
+            PgClass cls = classMapper.selectById(schoolClass.getClassId());
+            if (cls != null) {
+                sb.append(" / ").append(cls.getClassName());
+            }
+        }
+        
+        // 获取学科名称
+        if (dto.getSubjectId() != null) {
+            PgSubject subject = subjectMapper.selectById(dto.getSubjectId());
+            if (subject != null) {
+                sb.append(" / ").append(subject.getSubjectName());
+            }
+        }
+        
+        return sb.toString();
+    }
+
     /**
      * 校验并获取学校信息
      */