update

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/ExaminationBasicServiceImpl.java

@@ -449,11 +449,15 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
     @Override
     public Map<String, Object> getHomePageExams(Integer organId) {
         Map<String, Object> result=new HashMap<>();
-        result.put("exams", null);
-        result.put("statistics", null);
+
         List<Integer> childOrganIds = organizationService.getChildOrganIds(organId, true);
+
+        ExamStatisticsDto tenantExamStatistics = examinationBasicDao.getTenantExamStatistics(childOrganIds);
+        result.put("statistics", tenantExamStatistics);
+
         List<ExaminationBasicDto> dataList = examinationBasicDao.getUnderwayExams(organId,childOrganIds);
         if(CollectionUtils.isEmpty(dataList)){
+            result.put("exams", Collections.EMPTY_LIST);
             return result;
         }
 
@@ -477,8 +481,6 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
             examinationBasicDto.setTotalPaymentAmount(totalPaymentAmount);
         }
         result.put("exams", dataList);
-        ExamStatisticsDto tenantExamStatistics = examinationBasicDao.getTenantExamStatistics(childOrganIds);
-        result.put("statistics", tenantExamStatistics);
         return result;
     }
 

edu-user/edu-user-biz/src/main/resources/config/mybatis/ExaminationBasicMapper.xml

@@ -304,7 +304,7 @@
 				)
 		</if>
 		ORDER BY
-		create_time_ DESC
+		eb.id_
 		LIMIT 6;
 	</select>