修改学生登录

src/main/java/com/xjrsoft/module/organization/controller/UserController.java

@@ -228,11 +228,19 @@ public class UserController {
             vo.setPosts(userPostVoList);
         }
 
+        // 家长
         List<UserStudentVo> list = baseClassService.getStudents(user.getId());
         if (list != null) {
             vo.setStudents(list);
         }
 
+        // 学生
+        UserStudentVo userStudentVo = baseClassService.getClassInfo(user.getId());
+        if (userStudentVo != null) {
+            vo.setClassId(userStudentVo.getClassId());
+            vo.setClassName(userStudentVo.getClassName());
+        }
+
         return R.ok(vo);
     }
 

src/main/java/com/xjrsoft/module/organization/vo/UserInfoVo.java

@@ -76,6 +76,17 @@ public class UserInfoVo {
      */
     private String homePath;
 
+    /**
+     * 班级
+     */
+    private Long classId;
+
+    /**
+     * 班级名称
+     */
+
+    private String className;
+
 
     /**
      * 所有部门信息

src/main/java/com/xjrsoft/module/organization/vo/UserStudentVo.java

@@ -8,4 +8,5 @@ public class UserStudentVo extends UserStudentUpdateDto {
     private String studentName;
     private String className;
     private String avatar;
+    private Long classId;
 }

src/main/java/com/xjrsoft/module/student/service/IBaseClassService.java

@@ -8,4 +8,5 @@ import java.util.List;
 
 public interface IBaseClassService  extends MPJBaseService<BaseClass> {
     List<UserStudentVo> getStudents(long id);
+    UserStudentVo getClassInfo(long id);
 }

src/main/java/com/xjrsoft/module/student/service/impl/BaseClassServiceImpl.java

@@ -25,6 +25,11 @@ public class BaseClassServiceImpl  extends MPJBaseServiceImpl<BaseClassMapper, B
 
     private final IUserStudentService userStudentService;
 
+    /**
+     * 获取家长关联的学生 id 是家长的ID
+     * @param id
+     * @return
+     */
     public List<UserStudentVo> getStudents(long id) {
         List<Long> studentIds = userStudentService.list(Wrappers.lambdaQuery(UserStudent.class)
                         .eq(UserStudent::getUserId, id))
@@ -40,10 +45,31 @@ public class BaseClassServiceImpl  extends MPJBaseServiceImpl<BaseClassMapper, B
                     .selectAs(BaseClass::getName, UserStudentVo::getClassName)
                     .selectAs(BaseStudentUser::getName, UserStudentVo::getStudentName)
                     .selectAs(BaseStudentUser::getId, UserStudentVo::getStudentId)
+                    .selectAs(BaseStudentSchoolRoll::getClassId, UserStudentVo::getClassId)
                     .selectAs(BaseStudentUser::getAvatar, UserStudentVo::getAvatar);
 
             list = selectJoinList(UserStudentVo.class, queryWrapper);
         }
         return list;
     }
+
+    /**
+     * 获取学生的班级信息
+     * @param id
+     * @return
+     */
+    public UserStudentVo getClassInfo(long id) {
+        MPJLambdaWrapper<BaseClass> queryWrapper = new MPJLambdaWrapper<>();
+        queryWrapper
+                .disableSubLogicDel()
+                .rightJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getClassId, BaseStudent::getId)
+                .innerJoin(BaseStudentUser.class, BaseStudentUser::getId, BaseStudentSchoolRoll::getUserId)
+                .eq(BaseStudentSchoolRoll::getUserId, id)
+                .selectAs(BaseClass::getName, UserStudentVo::getClassName)
+                .selectAs(BaseStudentUser::getName, UserStudentVo::getStudentName)
+                .selectAs(BaseStudentUser::getId, UserStudentVo::getStudentId)
+                .selectAs(BaseStudentSchoolRoll::getClassId, UserStudentVo::getClassId)
+                .selectAs(BaseStudentUser::getAvatar, UserStudentVo::getAvatar);
+        return selectJoinOne(UserStudentVo.class, queryWrapper);
+    }
 }