/teacher/attendanceRecord/getPresentUserCheckInfo 没有部门不会返回数据

src/main/java/com/xjrsoft/module/teacher/service/impl/AttendanceRecordServiceImpl.java

@@ -178,10 +178,16 @@ public class AttendanceRecordServiceImpl extends MPJBaseServiceImpl<AttendanceRe
                 .eq(XjrUser::getId,dto.getUserId());
         List<PresentUserCheckInfoVo> presentUserCheckInfoVoList1 = xjrUserMapper.selectJoinList(PresentUserCheckInfoVo.class, queryWrapper3);
 
-        if(ObjectUtil.isNull(presentUserCheckInfoVoList1) || presentUserCheckInfoVoList1.size() <= 0){
-            throw new MyException("用户信息出现未知错误，请联系管理员");
+        PresentUserCheckInfoVo presentUserCheckInfoVo = new PresentUserCheckInfoVo();
+        if(ObjectUtil.isNotNull(presentUserCheckInfoVoList1) && presentUserCheckInfoVoList1.size() > 0){
+            presentUserCheckInfoVo = presentUserCheckInfoVoList1.get(0);
+        }else{
+            LambdaQueryWrapper<XjrUser> queryWrapper4 = new LambdaQueryWrapper<>();
+            queryWrapper4
+                    .eq(XjrUser::getId,dto.getUserId());
+            XjrUser xjrUser = xjrUserMapper.selectOne(queryWrapper4);
+            presentUserCheckInfoVo.setUserName(xjrUser.getName());
         }
-        PresentUserCheckInfoVo presentUserCheckInfoVo = presentUserCheckInfoVoList1.get(0);
 
         LambdaQueryWrapper<AttendanceConfig> queryWrapper02 = new LambdaQueryWrapper<>();
         queryWrapper02

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

@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.base.entity.BaseClass;
+import com.xjrsoft.module.base.mapper.BaseClassMapper;
+import com.xjrsoft.module.base.service.IBaseClassService;
 import com.xjrsoft.module.textbook.dto.TextbookPageDto;
 import com.xjrsoft.module.textbook.entity.*;
 import com.xjrsoft.module.textbook.mapper.TextbookClassRelationMapper;
@@ -38,6 +41,9 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
 
     private final  IWfTextbookSubscriptionService iWfTextbookSubscriptionService;
 
+    private final IBaseClassService baseClassService;
+    private final BaseClassMapper baseClassMapper;
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -163,10 +169,18 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
                     textbook.setIsTextbookPlan(wfTextbookSubscriptionItem.getIsTextbookPlan());
                     textbook.setTextbookType(wfTextbookSubscriptionItem.getSubscriptionType());
                     textbook.setAppraisalPrice(wfTextbookSubscriptionItem.getAppraisalPrice());
-                    textbook.setGradeId(345678345679L);// TODO 这个字段的意思
                     textbookTextbookMapper.insert(textbook);
                     if(ObjectUtil.isNotNull(wfTextbookSubscriptionItem.getClassIds()) && !wfTextbookSubscriptionItem.getClassIds().equals("")){
                         String classIds = wfTextbookSubscriptionItem.getClassIds();
+                        //查询年级
+                        LambdaQueryWrapper<BaseClass> queryWrapper1 = new LambdaQueryWrapper<>();
+                        queryWrapper1
+                                .in(BaseClass::getId,classIds)
+                                .groupBy(BaseClass::getGradeId);
+                        List<BaseClass> baseClassList = baseClassService.list(queryWrapper1);
+                        if(ObjectUtil.isNotNull(baseClassList) && baseClassList.size() == 1){
+                            textbook.setGradeId(baseClassList.get(0).getGradeId());
+                        }
                         String[] classIdStrs = classIds.split(",");
                         for (String classIdStr : classIdStrs) {
                             Long classId = Long.parseLong(classIdStr);