|
|
@@ -124,7 +124,11 @@ public class MedicalInsRuleInfoController extends JeecgController<MedicalInsRule
|
|
|
if (medicalInsRuleInfo == null) {
|
|
|
return Result.error("未找到对应数据");
|
|
|
}
|
|
|
- List<DictDto> dictDtos = sysDictService.queryDictByKeys(Arrays.asList(medicalInsRuleInfo.getSelectedRoles().split(",")));
|
|
|
+ List<DictDto> dictDtos = new ArrayList<>();
|
|
|
+ if(medicalInsRuleInfo.getSelectedRoles()!=null){
|
|
|
+ dictDtos = sysDictService.queryDictByKeys(Arrays.asList(medicalInsRuleInfo.getSelectedRoles().split(",")));
|
|
|
+ }
|
|
|
+
|
|
|
MedicalInsRuleProject medicalInsRuleProject = new MedicalInsRuleProject();
|
|
|
medicalInsRuleProject.setMedicalInsRuleInfoId(id);
|
|
|
if (StringUtils.hasText(projectName)) {
|
|
|
@@ -135,7 +139,7 @@ public class MedicalInsRuleInfoController extends JeecgController<MedicalInsRule
|
|
|
IPage<MedicalInsRuleProject> pageList = projectService.page(page, queryWrapper);
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
map.put("title", dictDtos);
|
|
|
- map.put("page", page);
|
|
|
+ map.put("page", pageList);
|
|
|
return Result.OK(map);
|
|
|
}
|
|
|
|