|
@@ -78,10 +78,11 @@ public class ProgramTypeDictController {
|
|
|
cIdList.addAll(cupIdList);
|
|
|
cIdList.addAll(pIdList);
|
|
|
List<String> idList = cIdList.stream().distinct().collect(Collectors.toList());
|
|
|
-
|
|
|
- QueryWrapper<ProgramTypeDict> wrapper = new QueryWrapper<ProgramTypeDict>()
|
|
|
- .in("ptd.id",idList);
|
|
|
- result = programTypeDictService.findList (page,wrapper);
|
|
|
+ if(CollectionUtil.isNotEmpty(idList)){
|
|
|
+ QueryWrapper<ProgramTypeDict> wrapper = new QueryWrapper<ProgramTypeDict>()
|
|
|
+ .in("ptd.id",idList);
|
|
|
+ result = programTypeDictService.findList (page,wrapper);
|
|
|
+ }
|
|
|
}else{
|
|
|
result = programTypeDictService.findList (page,new QueryWrapper<ProgramTypeDict>());
|
|
|
}
|