submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -1238,6 +1238,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             classGradeUser = iClassGradeUserService.getOne(new LambdaQueryWrapper<ClassGradeUser>()
                     .eq(ClassGradeUser::getGradeId, classGrade.getGradeId())
                     .eq(ClassGradeUser::getChangeGrade, 0)
+                    .eq(ClassGradeUser::getFinishStatus,  1)
                     .eq(ClassGradeUser::getStatus, 1)
                     .eq(ClassGradeUser::getUserId, user.getUserId()).last("limit 1"));
             if (Validator.isNotEmpty(classGradeUser)) {
@@ -1365,6 +1366,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             LambdaQueryWrapper<ClassGradeUser> lqw = Wrappers.lambdaQuery();
             lqw.eq(ClassGradeUser::getGradeId, classGrade.getGradeId());
             lqw.eq(ClassGradeUser::getUserId,  user.getUserId());
+            lqw.eq(ClassGradeUser::getFinishStatus,  1);
             lqw.eq(ClassGradeUser::getChangeGrade, 0);
             lqw.eq(ClassGradeUser::getStatus,  1);
             List<ClassGradeUser> gradeUserList = iClassGradeUserService.list(lqw);