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

c01eeb85 · abbfun · Gitee · f90899d7 · c01eeb85
Commit c01eeb85 authored Dec 08, 2020 by abbfun Committed by Gitee Dec 08, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java ...om/ruoyi/web/controller/system/SysDictDataController.java +4 -1

No files found.
--- 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);
    }

    /**