Kaynağa Gözat

回显数据字典防止空值报错

RuoYi 5 yıl önce
ebeveyn
işleme
bcdf270bb0

+ 8 - 1
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java

@@ -1,6 +1,7 @@
1
 package com.ruoyi.system.controller;
1
 package com.ruoyi.system.controller;
2
 
2
 
3
 import java.io.IOException;
3
 import java.io.IOException;
4
+import java.util.ArrayList;
4
 import java.util.List;
5
 import java.util.List;
5
 import javax.servlet.http.HttpServletResponse;
6
 import javax.servlet.http.HttpServletResponse;
6
 import org.springframework.beans.factory.annotation.Autowired;
7
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestBody;
14
 import org.springframework.web.bind.annotation.RequestMapping;
15
 import org.springframework.web.bind.annotation.RequestMapping;
15
 import org.springframework.web.bind.annotation.RestController;
16
 import org.springframework.web.bind.annotation.RestController;
16
 import com.ruoyi.common.core.utils.SecurityUtils;
17
 import com.ruoyi.common.core.utils.SecurityUtils;
18
+import com.ruoyi.common.core.utils.StringUtils;
17
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
19
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
18
 import com.ruoyi.common.core.web.controller.BaseController;
20
 import com.ruoyi.common.core.web.controller.BaseController;
19
 import com.ruoyi.common.core.web.domain.AjaxResult;
21
 import com.ruoyi.common.core.web.domain.AjaxResult;
@@ -75,7 +77,12 @@ public class SysDictDataController extends BaseController
75
     @GetMapping(value = "/type/{dictType}")
77
     @GetMapping(value = "/type/{dictType}")
76
     public AjaxResult dictType(@PathVariable String dictType)
78
     public AjaxResult dictType(@PathVariable String dictType)
77
     {
79
     {
78
-        return AjaxResult.success(dictTypeService.selectDictDataByType(dictType));
80
+        List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
81
+        if (StringUtils.isNull(data))
82
+        {
83
+            data = new ArrayList<SysDictData>();
84
+        }
85
+        return AjaxResult.success(data);
79
     }
86
     }
80
 
87
 
81
     /**
88
     /**