lbqms.git - Gitblit

			@@ -1,13 +1,14 @@
			package com.ruoyi.web.controller.system;

			import cn.dev33.satoken.annotation.SaCheckPermission;
			import cn.hutool.core.util.ObjectUtil;
			import com.ruoyi.common.annotation.Log;
			import com.ruoyi.common.core.controller.BaseController;
			import com.ruoyi.common.core.domain.AjaxResult;
			import com.ruoyi.common.core.domain.PageQuery;
			import com.ruoyi.common.core.domain.entity.SysDictData;
			import com.ruoyi.common.core.page.TableDataInfo;
			import com.ruoyi.common.enums.BusinessType;
			import com.ruoyi.common.utils.StringUtils;
			import com.ruoyi.common.utils.poi.ExcelUtil;
			import com.ruoyi.system.service.ISysDictDataService;
			import com.ruoyi.system.service.ISysDictTypeService;
			@@ -15,7 +16,6 @@
			import io.swagger.annotations.ApiOperation;
			import io.swagger.annotations.ApiParam;
			import lombok.RequiredArgsConstructor;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.validation.annotation.Validated;
			import org.springframework.web.bind.annotation.*;

			@@ -30,7 +30,7 @@
			*/
			@Validated
			@Api(value = "数据字典信息控制器", tags = {"数据字典信息管理"})
			@RequiredArgsConstructor(onConstructor_ = @Autowired)
			@RequiredArgsConstructor
			@RestController
			@RequestMapping("/system/dict/data")
			public class SysDictDataController extends BaseController {
			@@ -41,8 +41,8 @@
			@ApiOperation("查询字典数据列表")
			@SaCheckPermission("system:dict:list")
			@GetMapping("/list")
			public TableDataInfo<SysDictData> list(SysDictData dictData) {
			return dictDataService.selectPageDictDataList(dictData);
			public TableDataInfo<SysDictData> list(SysDictData dictData, PageQuery pageQuery) {
			return dictDataService.selectPageDictDataList(dictData, pageQuery);
			}

			@ApiOperation("导出字典数据列表")
			@@ -71,7 +71,7 @@
			@GetMapping(value = "/type/{dictType}")
			public AjaxResult<List<SysDictData>> dictType(@ApiParam("字典类型") @PathVariable String dictType) {
			List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
			if (StringUtils.isNull(data)) {
			if (ObjectUtil.isNull(data)) {
			data = new ArrayList<>();
			}
			return AjaxResult.success(data);