Merge branch 'zcwy0731-llf' into master-0705

# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamTest.java
This commit is contained in:
nisen
2024-08-01 17:43:07 +08:00
2 changed files with 1 additions and 3 deletions

View File

@@ -178,6 +178,4 @@ public class ExamTest extends BaseEntity {
@Transient
private String paperName;
}

View File

@@ -95,7 +95,7 @@ public class ExamTestServiceImpl implements IExamTestService {
@Override
public Boolean has(String paperId) {
ExamTest et=examTestDao.findOne(FieldFilters.eq("paperId", paperId));
ExamTest et=examTestDao.findOne(FieldFilters.eq("paperId", paperId),FieldFilters.eq("deleted", false));
//String etId= (String)examTestDao.findField("id", FieldFilters.eq("paperId", paperId));
if(et==null){
return true;