作者 RuoYi

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

1 package com.ruoyi.web.controller.system; 1 package com.ruoyi.web.controller.system;
2 2
  3 +import java.util.ArrayList;
3 import java.util.List; 4 import java.util.List;
4 import org.springframework.beans.factory.annotation.Autowired; 5 import org.springframework.beans.factory.annotation.Autowired;
5 import org.springframework.security.access.prepost.PreAuthorize; 6 import org.springframework.security.access.prepost.PreAuthorize;
@@ -19,6 +20,7 @@ import com.ruoyi.common.core.domain.entity.SysDictData; @@ -19,6 +20,7 @@ import com.ruoyi.common.core.domain.entity.SysDictData;
19 import com.ruoyi.common.core.page.TableDataInfo; 20 import com.ruoyi.common.core.page.TableDataInfo;
20 import com.ruoyi.common.enums.BusinessType; 21 import com.ruoyi.common.enums.BusinessType;
21 import com.ruoyi.common.utils.SecurityUtils; 22 import com.ruoyi.common.utils.SecurityUtils;
  23 +import com.ruoyi.common.utils.StringUtils;
22 import com.ruoyi.common.utils.poi.ExcelUtil; 24 import com.ruoyi.common.utils.poi.ExcelUtil;
23 import com.ruoyi.system.service.ISysDictDataService; 25 import com.ruoyi.system.service.ISysDictDataService;
24 import com.ruoyi.system.service.ISysDictTypeService; 26 import com.ruoyi.system.service.ISysDictTypeService;
@@ -73,10 +75,12 @@ public class SysDictDataController extends BaseController @@ -73,10 +75,12 @@ public class SysDictDataController extends BaseController
73 @GetMapping(value = "/type/{dictType}") 75 @GetMapping(value = "/type/{dictType}")
74 public AjaxResult dictType(@PathVariable String dictType) 76 public AjaxResult dictType(@PathVariable String dictType)
75 { 77 {
76 - List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);  
77 - if (data == null)  
78 - data = new ArrayList<>();  
79 - return AjaxResult.success(data); 78 + List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
  79 + if (StringUtils.isNull(data))
  80 + {
  81 + data = new ArrayList<SysDictData>();
  82 + }
  83 + return AjaxResult.success(data);
80 } 84 }
81 85
82 /** 86 /**