diff --git a/src/main/java/com/dsideal/FengHuang/Exam/Model/ExamModel.java b/src/main/java/com/dsideal/FengHuang/Exam/Model/ExamModel.java index 2765ee1..3fbfe20 100644 --- a/src/main/java/com/dsideal/FengHuang/Exam/Model/ExamModel.java +++ b/src/main/java/com/dsideal/FengHuang/Exam/Model/ExamModel.java @@ -5,6 +5,7 @@ import com.jfinal.aop.Before; import com.jfinal.ext.interceptor.GET; import com.jfinal.ext.interceptor.POST; import com.jfinal.kit.Kv; +import com.jfinal.kit.StrKit; import com.jfinal.plugin.activerecord.Db; import com.jfinal.plugin.activerecord.Page; import com.jfinal.plugin.activerecord.Record; @@ -127,7 +128,15 @@ public class ExamModel { public Record getQuestion(String person_id, int order_id) { String sql = "select question_id from t_exam_record where person_id=? and order_id=?"; int question_id = Db.findFirst(sql, person_id, order_id).getInt("question_id"); - return Db.findById("t_exam_question", "question_id", question_id); + + sql = "select question_id,type_id,content,A,B,C,D,E,F,G,score from t_exam_question where question_id=?"; + Record record = Db.findFirst(sql, question_id); + if (StrKit.isBlank(record.getStr("C"))) record.remove("C"); + if (StrKit.isBlank(record.getStr("D"))) record.remove("D"); + if (StrKit.isBlank(record.getStr("E"))) record.remove("E"); + if (StrKit.isBlank(record.getStr("F"))) record.remove("F"); + if (StrKit.isBlank(record.getStr("G"))) record.remove("G"); + return record; } /**