Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/student/controller/BaseStudentInfoController.java

@@ -14,6 +14,7 @@ import com.xjrsoft.module.student.dto.BaseStudentInfoDetailDto;
 import com.xjrsoft.module.student.dto.BaseStudentInfoPageDto;
 import com.xjrsoft.module.student.dto.BaseStudentSimpleInfoDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentInfoDto;
+import com.xjrsoft.module.student.entity.BaseStudent;
 import com.xjrsoft.module.student.entity.BaseStudentUser;
 import com.xjrsoft.module.student.service.IBaseStudentSchoolRollService;
 import com.xjrsoft.module.student.service.IStudentManagerService;
@@ -94,6 +95,9 @@ public class  BaseStudentInfoController {
         BaseStudentInfoDetailDto dto = new BaseStudentInfoDetailDto();
         dto.setId(id);
         BaseStudentInfoDetailVo detailVo = baseStudentSchoolRollService.getInfoById(dto);
+
+        BaseStudentUser baseStudentUser = studentManagerService.getByIdDeep(id);
+        detailVo.setStudentId(baseStudentUser.getBaseStudentList().get(0).getStudentId());
         if (detailVo == null) {
             return RT.error("找不到此数据！");
         }