xiatian 11 місяців тому
батько
коміт
90ffe79938

+ 4 - 0
src/main/java/cn/com/qmth/am/service/impl/StudentScoreServiceImpl.java

@@ -771,6 +771,10 @@ public class StudentScoreServiceImpl extends ServiceImpl<StudentScoreDao, Studen
 		lw.eq(StudentScoreEntity::getSubjectCode, subjectCode);
 		lw.eq(StudentScoreEntity::getSubjectCode, subjectCode);
 		lw.eq(StudentScoreEntity::getMainNumber, mainNumber);
 		lw.eq(StudentScoreEntity::getMainNumber, mainNumber);
 		lw.eq(StudentScoreEntity::getSubNumber, subNumber);
 		lw.eq(StudentScoreEntity::getSubNumber, subNumber);
+		lw.and(wq -> {
+            wq.or(wq1 -> wq1.isNull(StudentScoreEntity::getScoreNone));
+            wq.or(wq2 -> wq2.eq(StudentScoreEntity::getScoreNone, false));
+        });
 		if(exZero!=null&&exZero) {
 		if(exZero!=null&&exZero) {
 			lw.and(wq -> {
 			lw.and(wq -> {
                 wq.or(wq1 -> wq1.ne(StudentScoreEntity::getAiScore, 0));
                 wq.or(wq1 -> wq1.ne(StudentScoreEntity::getAiScore, 0));