|  | @@ -1,6 +1,7 @@
 | 
											
												
													
														|  |  package com.ruoyi.system.controller;
 |  |  package com.ruoyi.system.controller;
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  import java.io.IOException;
 |  |  import java.io.IOException;
 | 
											
												
													
														|  | 
 |  | +import java.util.ArrayList;
 | 
											
												
													
														|  |  import java.util.List;
 |  |  import java.util.List;
 | 
											
												
													
														|  |  import javax.servlet.http.HttpServletResponse;
 |  |  import javax.servlet.http.HttpServletResponse;
 | 
											
												
													
														|  |  import org.springframework.beans.factory.annotation.Autowired;
 |  |  import org.springframework.beans.factory.annotation.Autowired;
 | 
											
										
											
												
													
														|  | @@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 | 
											
												
													
														|  |  import org.springframework.web.bind.annotation.RequestMapping;
 |  |  import org.springframework.web.bind.annotation.RequestMapping;
 | 
											
												
													
														|  |  import org.springframework.web.bind.annotation.RestController;
 |  |  import org.springframework.web.bind.annotation.RestController;
 | 
											
												
													
														|  |  import com.ruoyi.common.core.utils.SecurityUtils;
 |  |  import com.ruoyi.common.core.utils.SecurityUtils;
 | 
											
												
													
														|  | 
 |  | +import com.ruoyi.common.core.utils.StringUtils;
 | 
											
												
													
														|  |  import com.ruoyi.common.core.utils.poi.ExcelUtil;
 |  |  import com.ruoyi.common.core.utils.poi.ExcelUtil;
 | 
											
												
													
														|  |  import com.ruoyi.common.core.web.controller.BaseController;
 |  |  import com.ruoyi.common.core.web.controller.BaseController;
 | 
											
												
													
														|  |  import com.ruoyi.common.core.web.domain.AjaxResult;
 |  |  import com.ruoyi.common.core.web.domain.AjaxResult;
 | 
											
										
											
												
													
														|  | @@ -75,7 +77,12 @@ public class SysDictDataController extends BaseController
 | 
											
												
													
														|  |      @GetMapping(value = "/type/{dictType}")
 |  |      @GetMapping(value = "/type/{dictType}")
 | 
											
												
													
														|  |      public AjaxResult dictType(@PathVariable String dictType)
 |  |      public AjaxResult dictType(@PathVariable String dictType)
 | 
											
												
													
														|  |      {
 |  |      {
 | 
											
												
													
														|  | -        return AjaxResult.success(dictTypeService.selectDictDataByType(dictType));
 |  | 
 | 
											
												
													
														|  | 
 |  | +        List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
 | 
											
												
													
														|  | 
 |  | +        if (StringUtils.isNull(data))
 | 
											
												
													
														|  | 
 |  | +        {
 | 
											
												
													
														|  | 
 |  | +            data = new ArrayList<SysDictData>();
 | 
											
												
													
														|  | 
 |  | +        }
 | 
											
												
													
														|  | 
 |  | +        return AjaxResult.success(data);
 | 
											
												
													
														|  |      }
 |  |      }
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |      /**
 |  |      /**
 |