From 1657e06be6d89aa0be4a1533fc97bc233bedeb32 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期二, 08 十二月 2020 16:03:51 +0800
Subject: [PATCH] !132 update ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java. Merge pull request !132 from abbfun/N/A
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git 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
index 58cf43d..9e966d4 100644
--- 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 @@
@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);
}
/**
--
Gitblit v1.9.2