新生账号激活bug修复

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

@@ -86,6 +86,7 @@ import com.xjrsoft.module.system.entity.DictionaryDetail;
 import com.xjrsoft.module.system.entity.File;
 import com.xjrsoft.module.system.service.IFileService;
 import com.xjrsoft.module.teacher.entity.BaseTeacher;
+import com.xjrsoft.module.teacher.entity.XjrUser;
 import com.xjrsoft.module.workflow.constant.WorkflowConstant;
 import com.xjrsoft.module.workflow.service.IWorkflowExecuteService;
 import io.swagger.annotations.Api;
@@ -767,7 +768,11 @@ public class UserController {
                         .innerJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getUserId, UserStudent::getStudentId)
                         .innerJoin(BaseStudentUser.class, BaseStudentUser::getId, UserStudent::getStudentId)
                         .leftJoin(BaseClass.class, BaseClass::getId, BaseStudentSchoolRoll::getClassId)
+                        .leftJoin(XjrUser.class, XjrUser::getId, BaseClass::getTeacherId)
                         .select(BaseStudentSchoolRoll::getClassId)
+                        .selectAs(XjrUser::getName, UserStudentVo::getTeacherName)
+                        .selectAs(XjrUser::getMobile, UserStudentVo::getTeacherMobile)
+                        .selectAs(XjrUser::getId, UserStudentVo::getTeacherId)
                         .select(UserStudent::getStudentId,UserStudent::getStatus)
                         .selectAs(BaseClass::getName, UserStudentVo::getClassName)
                         .selectAs(BaseStudentUser::getName, UserStudentVo::getStudentName)

src/main/java/com/xjrsoft/module/personnel/controller/FaceManagementController.java

@@ -93,7 +93,7 @@ public class FaceManagementController {
     @GetMapping(value = "/detail")
     @ApiOperation(value = "根据当前用户查询人脸信息")
     @SaCheckPermission("facemanager:detail")
-    public RT<FaceManagementVo> detail(@RequestParam Long id) {
+    public RT<FaceManagementVo> detail(Long id) {
         Long userId = StpUtil.getLoginIdAsLong();
         if(id != null){
             userId = id;