|
@@ -419,8 +419,14 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
|
|
|
dictionaryInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
.eq("group_type", 4)
|
|
|
.eq("return_type", 1)
|
|
|
- .notIn("val",types)
|
|
|
.orderByAsc("order_no");
|
|
|
+ if(getModuleTypeVO.getRelationId().intValue() == -1){//如果是-1时返回所有子模板
|
|
|
+ dictionaryInfoQueryWrapper.eq("val","322")
|
|
|
+ .eq("val","31")
|
|
|
+ .eq("val","32");
|
|
|
+ }else {
|
|
|
+ dictionaryInfoQueryWrapper.notIn("val",types);
|
|
|
+ }
|
|
|
List<DictionaryInfo> dictionaryInfoList = dictionaryFacade.list(dictionaryInfoQueryWrapper);
|
|
|
List<GetModuleTypeDTO> getModuleTypeDTOS = new ArrayList<>();
|
|
|
for (DictionaryInfo dictionaryInfo: dictionaryInfoList) {
|