|
@@ -583,16 +583,18 @@ public class MarkStudent implements Serializable {
|
|
|
}
|
|
|
|
|
|
public List<String> getAnswerList() {
|
|
|
-// String[] values = StringUtils.split(StringUtils.trimToNull(answers), ANSWER_SPLIT);
|
|
|
-// List<String> list = new ArrayList<String>();
|
|
|
-// if (values != null && values.length > 0) {
|
|
|
-// for (String answer : values) {
|
|
|
-// list.add(StringUtils.trim(answer));
|
|
|
-// }
|
|
|
-// }
|
|
|
- List<String> list = new ArrayList<String>();
|
|
|
+ List<String> list = new ArrayList<>();
|
|
|
if(StringUtils.isNotBlank(answers)){
|
|
|
- list = JSON.parseArray(answers, String.class);
|
|
|
+ try {
|
|
|
+ list = JSON.parseArray(answers, String.class);
|
|
|
+ } catch (Exception e) {
|
|
|
+ String[] values = StringUtils.split(StringUtils.trimToNull(answers), ANSWER_SPLIT);
|
|
|
+ if (values != null && values.length > 0) {
|
|
|
+ for (String answer : values) {
|
|
|
+ list.add(StringUtils.trim(answer));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
return list;
|
|
|
}
|