Merge branch 'zcwy0912-llf' into 104-master

This commit is contained in:
nisen
2024-09-30 12:02:11 +08:00

View File

@@ -312,8 +312,8 @@ public class ExamQuestionApi extends ApiBaseController {
if(row1.getCell(1).getStringCellValue().equals("多选题")){ if(row1.getCell(1).getStringCellValue().equals("多选题")){
examQuestion.setType(2); examQuestion.setType(2);
} }
log.debug("row1.getCell(2) = " + row1.getCell(2));
if (row1.getCell(2).getStringCellValue() == null || row1.getCell(2).getStringCellValue().equals("")){ if (row1.getCell(2)==null ||row1.getCell(2).getStringCellValue() == null || row1.getCell(2).getStringCellValue().equals("")){
examQuestion.setDifficulty(null); examQuestion.setDifficulty(null);
}else{ }else{
if( row1.getCell(2).getStringCellValue().equals("")){ if( row1.getCell(2).getStringCellValue().equals("")){