bug修改

src/main/java/com/xjrsoft/module/textbook/controller/TextbookStudentClaimController.java

@@ -1,18 +1,22 @@
 package com.xjrsoft.module.textbook.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.annotation.XjrLog;
+import com.xjrsoft.common.enums.DeleteMark;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.base.entity.BaseClass;
 import com.xjrsoft.module.base.entity.BaseCourseSubject;
 import com.xjrsoft.module.base.entity.CourseSubjectDetail;
+import com.xjrsoft.module.base.service.IBaseClassService;
 import com.xjrsoft.module.system.entity.DictionaryDetail;
 import com.xjrsoft.module.textbook.dto.*;
 import com.xjrsoft.module.textbook.entity.Textbook;
@@ -45,6 +49,7 @@ import java.util.List;
 public class TextbookStudentClaimController {
 
     private final ITextbookStudentClaimService textbookStudentClaimService;
+    private final IBaseClassService baseClassService;
 
     @GetMapping(value = "/head-tea-look-class-book-semester")
     @ApiOperation(value = "班主任查看班级教材学期页面")
@@ -56,6 +61,25 @@ public class TextbookStudentClaimController {
         return RT.ok(pageOutput);
     }
 
+    @GetMapping(value = "/class-list")
+    @ApiOperation(value = "获取班主任管理的班级")
+    @SaCheckPermission("textbookstudentclaim:detail")
+    @XjrLog(value = "获取班主任管理的班级")
+    public RT<List<BaseClass>> classList() {
+        // 教材管理员获取所有班级，班主任只获取当前管理班级
+        LambdaQueryWrapper<BaseClass> baseClassLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        baseClassLambdaQueryWrapper
+                .eq(BaseClass::getDeleteMark, DeleteMark.NODELETE.getCode())
+                ;
+        if(!StpUtil.hasRole("BOOKAdmin")) {
+            baseClassLambdaQueryWrapper
+                    .eq(BaseClass::getTeacherId, StpUtil.getLoginIdAsLong());
+        }
+
+        List<BaseClass> baseClasses = baseClassService.list(baseClassLambdaQueryWrapper);
+        return RT.ok(baseClasses);
+    }
+
     @GetMapping(value = "/head-tea-look-class-book")
     @ApiOperation(value = "班主任查看班级教材页面")
     @SaCheckPermission("textbookstudentclaim:detail")

src/main/java/com/xjrsoft/module/textbook/service/impl/TextbookServiceImpl.java

@@ -1133,6 +1133,7 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
                     .in(BaseClassAdminCourse::getClassId, classIdList)
                     .notIn(!baseClassCourseIds.isEmpty(), BaseClassCourse::getId, baseClassCourseIds)
                     .eq(BaseClassCourse::getDeleteMark, DeleteMark.NODELETE.getCode())
+                    .eq(BaseStudentSchoolRoll::getDeleteMark, DeleteMark.NODELETE.getCode())
                     .groupBy(BaseClassCourse::getTextbookId)
                     .groupBy(BaseClassAdminCourse::getClassId)
             ;

src/main/java/com/xjrsoft/module/textbook/service/impl/TextbookStudentClaimServiceImpl.java

@@ -768,6 +768,7 @@ public class TextbookStudentClaimServiceImpl extends MPJBaseServiceImpl<Textbook
                 .leftJoin(BaseStudent.class, BaseStudent::getUserId, BaseStudentSchoolRoll::getUserId)
                 .eq(BaseStudentSchoolRoll::getArchivesStatus, ArchivesStatusEnum.FB2901.getCode())
                 .eq(BaseStudentSchoolRoll::getClassId, dto.getClassId())
+                .eq(BaseStudentSchoolRoll::getDeleteMark, DeleteMark.NODELETE.getCode())
                 .orderByAsc(BaseStudent::getStudentId)
         ;
         List<TeacherCheckStuClaimVo> stuList = baseStudentSchoolRollMapper.selectJoinList(TeacherCheckStuClaimVo.class, baseStudentSchoolRollMPJLambdaWrapper);

src/main/java/com/xjrsoft/module/textbook/service/impl/WfTextbookClaimServiceImpl.java

@@ -148,6 +148,9 @@ public class WfTextbookClaimServiceImpl extends MPJBaseServiceImpl<WfTextbookCla
         // 当申领记录为空
         List<DistributePageVo> records = page.getRecords();
 
+        if(CollectionUtils.isEmpty(records)){
+            return page;
+        }
 
         List<Long> claimIds = records.stream()
                 .map(DistributePageVo::getId)