|
@@ -421,7 +421,7 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
|
|
|
.eq("return_type", 1)
|
|
|
.notIn("val",types)
|
|
|
.orderByAsc("order_no");
|
|
|
- if(getModuleTypeVO.getRelationId().intValue() == -1){//如果是-1时返回所有子模板
|
|
|
+ if(getModuleTypeVO.getRelationId() != null && getModuleTypeVO.getRelationId().intValue() == -1){//如果是-1时返回所有子模板
|
|
|
dictionaryInfoQueryWrapper.in("val","322","31","32");
|
|
|
}
|
|
|
List<DictionaryInfo> dictionaryInfoList = dictionaryFacade.list(dictionaryInfoQueryWrapper);
|