update

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentManageServiceImpl.java

@@ -146,19 +146,22 @@ public class StudentManageServiceImpl implements StudentManageService {
 		Map<Integer,StudentListCourseDto> StudentListCourseDtoMap = studentListCourseDtoList.stream().collect(Collectors.toMap(StudentListCourseDto::getUserId, studentListCourseDto -> studentListCourseDto));
 		
 		StudentListCourseDto studentListCourseDto = null;
-		for(StudentManageListDto dto : dataList){
+		for (StudentManageListDto dto : dataList) {
 			studentListCourseDto = StudentListCourseDtoMap.get(dto.getUserId());
-			if(studentListCourseDto != null){
-				if(studentListCourseDto.getRemainCourseNum() > 0){
+			if (studentListCourseDto != null) {
+				if (studentListCourseDto.getRemainCourseNum() > 0) {
 					dto.setHasCourse(YesOrNoEnum.YES);
-				}else{
+				} else {
 					dto.setHasCourse(YesOrNoEnum.NO);
 				}
-				if(studentListCourseDto.getRemainPracticeNum() > 0){
+				if (studentListCourseDto.getRemainPracticeNum() > 0) {
 					dto.setHasPracticeCourse(YesOrNoEnum.YES);
-				}else{
+				} else {
 					dto.setHasPracticeCourse(YesOrNoEnum.NO);
 				}
+			} else {
+				dto.setHasCourse(YesOrNoEnum.NO);
+				dto.setHasPracticeCourse(YesOrNoEnum.NO);
 			}
 		}
 		
@@ -182,6 +185,7 @@ public class StudentManageServiceImpl implements StudentManageService {
                 e.setVipGroupStatus(vipGroupStatus.get(e.getUserId()));
             });
 		}
+		pageInfo.setRows(dataList);
         return pageInfo;
     }
 

mec-biz/src/main/resources/config/mybatis/StudentManageDao.xml

@@ -149,7 +149,8 @@
 
     <select id="findStudentsByOrganId" resultMap="studentManageListDto">
         SELECT o.`name_` organ_name_,s.`user_id_` ,su.`username_` ,su.`phone_` parents_phone_,su.`real_name_` ,su.`gender_` , su.organ_id_,
-		tu.`username_` teacher_name_,s.`service_tag_` ,s.`operating_tag_` , suca.`course_balance_` ,sub.`name_` music_group_subject_ ,su.birthdate_,s.subject_id_list_,s.teacher_id_
+		tu.`real_name_` teacher_name_,s.`service_tag_` ,s.`operating_tag_` , suca.`course_balance_` ,sub.`name_` music_group_subject_ ,su.birthdate_,s.subject_id_list_,s.teacher_id_,
+		case when su.password_ is null then false else true end isActive_
 		FROM `student` s LEFT JOIN `sys_user` su on s.`user_id_` = su.`id_`
 		LEFT JOIN `organization` o on o.`id_` = su.`organ_id_`
 		LEFT JOIN `sys_user` tu on tu.`id_` = s.`teacher_id_`