|
@@ -621,9 +621,11 @@ public class GenPaperService {
|
|
|
List<String> quesNames = uc.getUnitStruct().getQuesNames();
|
|
|
if(quesNames != null && quesNames.size() > 0){
|
|
|
if(quesNames.contains(question.getQuesName()) && !uc.finish() && uc.getUnitStruct().getQuestionType().name().equals(question.getQuestionType().name())){
|
|
|
- if(question.getPropertyGroup().contains(uc.getUnitStruct().getPropertyGroup())){
|
|
|
- return true;
|
|
|
- }
|
|
|
+ if(question.getPropertyGroup() != null){
|
|
|
+ if(question.getPropertyGroup().contains(uc.getUnitStruct().getPropertyGroup())){
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
return false;
|