|
|
@@ -574,12 +574,13 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
|
|
|
paramMap.put("notControlType", questionIndexVO.getNotControlType());
|
|
|
List<QuestionInfo> res = this.index(paramMap);
|
|
|
//过滤出没有量表内容标签
|
|
|
- if(questionIndexVO.getFilterList().contains("scale")) {
|
|
|
+ if (ListUtil.isNotEmpty(questionIndexVO.getFilterList()) &&
|
|
|
+ questionIndexVO.getFilterList().contains("scale")) {
|
|
|
List<ScaleContent> scaleContents = scaleContentFacade.list(new QueryWrapper<ScaleContent>()
|
|
|
.eq("is_deleted", IsDeleteEnum.N.getKey()));
|
|
|
Set<Long> ids = scaleContents.stream().map(row -> row.getScaleId()).collect(Collectors.toSet());
|
|
|
- for(int i = 0; i<res.size(); i++) {
|
|
|
- if(ids.contains(res.get(i).getId())) {
|
|
|
+ for (int i = 0; i < res.size(); i++) {
|
|
|
+ if (ids.contains(res.get(i).getId())) {
|
|
|
res.remove(i--);
|
|
|
}
|
|
|
}
|
zhoutg