Browse Source

mobile-page

fanxp 1 year ago
parent
commit
3dfad34934

+ 3 - 0
src/main/java/com/xjrsoft/module/student/controller/BaseStudentAssessmentInspectionController.java

@@ -79,6 +79,9 @@ public class BaseStudentAssessmentInspectionController {
     @SaCheckPermission("basestudentbehaviormanage:detail")
     public RT<PageOutput<BaseStudentAssessmentInspectionMobilePageVo>> mobilePage(@Valid BaseStudentAssessmentInspectionMobilePageDto dto) {
         Page<BaseStudentAssessmentInspectionMobilePageVo> page = baseStudentAssessmentInspectionService.getMobilePage(new Page<>(dto.getLimit(), dto.getSize()), dto);
+        if (page == null) {
+            return RT.ok(ConventPage.getPageOutputNull(BaseStudentAssessmentInspectionMobilePageVo.class));
+        }
         return RT.ok(ConventPage.getPageOutput(page, BaseStudentAssessmentInspectionMobilePageVo.class));
     }
 

+ 3 - 0
src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentAssessmentInspectionServiceImpl.java

@@ -111,6 +111,9 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
             ).stream().map(BaseClass::getId).collect(Collectors.toList());
             dto.setClassIds(classIds);
         }
+        if (dto.getClassIds() == null || dto.getClassIds().size() == 0) {
+            return null;
+        }
         Page<BaseStudentAssessmentInspectionMobilePageVo> result = assessmentInspectionMapper.getMobilePage(page, dto);
         // 处理加减分
         result.getRecords().forEach((node) -> {

+ 0 - 1
src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentBehaviorClassRelationServiceImpl.java

@@ -30,7 +30,6 @@ public class BaseStudentBehaviorClassRelationServiceImpl extends ServiceImpl<Bas
 
     private final BaseStudentBehaviorClassRelationMapper baseStudentBehaviorClassRelationMapper;
     private final IBaseStudentBehaviorManageService baseStudentBehaviorManageService;
-    private final XjrUserMapper xjrUserMapper;
 
     @Override
     public Boolean dataCache(Long dataId) {