!132 update ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java.

Merge pull request !132 from abbfun/N/A
5 years ago · 1657e06be6
parent f90899d72a c01eeb8521
commit 1657e06be6
1 changed files with 4 additions and 1 deletions
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
@ -73,7 +73,10 @@ public class SysDictDataController extends BaseController
    @GetMapping(value = "/type/{dictType}")
    public AjaxResult dictType(@PathVariable String dictType)
    {
-        return AjaxResult.success(dictTypeService.selectDictDataByType(dictType));
+		List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
+		if (data == null)
+			data = new ArrayList<>();
+		return AjaxResult.success(data);
    }

    /**