|
@@ -498,11 +498,11 @@ public class ReportController {
|
|
|
|
|
|
private String getOptionJson(ReportSubjectQuery query, ReportSubject reportSubject, String paperType) {
|
|
private String getOptionJson(ReportSubjectQuery query, ReportSubject reportSubject, String paperType) {
|
|
JSONObject value = new JSONObject();
|
|
JSONObject value = new JSONObject();
|
|
- value.accumulate("options", reportSubject.getOptions().split(ANSWER_SPLIT));
|
|
|
|
- JSONArray array = new JSONArray();
|
|
|
|
|
|
+ value.accumulate("options", reportSubject.getOptions() == null?new JSONArray().toString():reportSubject.getOptions().split(ANSWER_SPLIT));
|
|
query.setObjective(true);
|
|
query.setObjective(true);
|
|
query.setPaperType(paperType);
|
|
query.setPaperType(paperType);
|
|
List<ReportSubjectQuestion> list = questionService.findByQuery(query);
|
|
List<ReportSubjectQuestion> list = questionService.findByQuery(query);
|
|
|
|
+ JSONArray array = new JSONArray();
|
|
for (ReportSubjectQuestion r : list) {
|
|
for (ReportSubjectQuestion r : list) {
|
|
JSONObject jsonObject = new JSONObject();
|
|
JSONObject jsonObject = new JSONObject();
|
|
jsonObject.accumulate("number", r.getMainNumber() + "-" + r.getSubNumber());
|
|
jsonObject.accumulate("number", r.getMainNumber() + "-" + r.getSubNumber());
|