From b459fcc72644e36e36017d30fcd645c425178ab5 Mon Sep 17 00:00:00 2001 From: zlyx <1242874891@qq.com> Date: Thu, 2 Feb 2023 15:43:43 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=9B=B4=E6=96=B0=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=91=BD=E5=90=8D=20;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/SysDictDataController.java | 8 ++++---- .../system/SysDictTypeController.java | 20 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictDataController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictDataController.java index 68bbe8bad..5cc5e892b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictDataController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictDataController.java @@ -87,8 +87,8 @@ public class SysDictDataController extends BaseController { @SaCheckPermission("system:dict:add") @Log(title = "字典数据", businessType = BusinessType.INSERT) @PostMapping - public R add(@Validated @RequestBody SysDictDataBo dictData) { - dictDataService.insertDictData(dictData); + public R add(@Validated @RequestBody SysDictDataBo dict) { + dictDataService.insertDictData(dict); return R.ok(); } @@ -98,8 +98,8 @@ public class SysDictDataController extends BaseController { @SaCheckPermission("system:dict:edit") @Log(title = "字典数据", businessType = BusinessType.UPDATE) @PutMapping - public R edit(@Validated @RequestBody SysDictDataBo dictData) { - dictDataService.updateDictData(dictData); + public R edit(@Validated @RequestBody SysDictDataBo dict) { + dictDataService.updateDictData(dict); return R.ok(); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictTypeController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictTypeController.java index b1d3b597b..291920d5f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictTypeController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictTypeController.java @@ -48,8 +48,8 @@ public class SysDictTypeController extends BaseController { @Log(title = "字典类型", businessType = BusinessType.EXPORT) @SaCheckPermission("system:dict:export") @PostMapping("/export") - public void export(SysDictTypeBo bo, HttpServletResponse response) { - List list = dictTypeService.selectDictTypeList(bo); + public void export(SysDictTypeBo dictType, HttpServletResponse response) { + List list = dictTypeService.selectDictTypeList(dictType); ExcelUtil.exportExcel(list, "字典类型", SysDictTypeVo.class, response); } @@ -70,11 +70,11 @@ public class SysDictTypeController extends BaseController { @SaCheckPermission("system:dict:add") @Log(title = "字典类型", businessType = BusinessType.INSERT) @PostMapping - public R add(@Validated @RequestBody SysDictTypeBo dictType) { - if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dictType))) { - return R.fail("新增字典'" + dictType.getDictName() + "'失败，字典类型已存在"); + public R add(@Validated @RequestBody SysDictTypeBo dict) { + if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) { + return R.fail("新增字典'" + dict.getDictName() + "'失败，字典类型已存在"); } - dictTypeService.insertDictType(dictType); + dictTypeService.insertDictType(dict); return R.ok(); } @@ -84,11 +84,11 @@ public class SysDictTypeController extends BaseController { @SaCheckPermission("system:dict:edit") @Log(title = "字典类型", businessType = BusinessType.UPDATE) @PutMapping - public R edit(@Validated @RequestBody SysDictTypeBo dictType) { - if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dictType))) { - return R.fail("修改字典'" + dictType.getDictName() + "'失败，字典类型已存在"); + public R edit(@Validated @RequestBody SysDictTypeBo dict) { + if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) { + return R.fail("修改字典'" + dict.getDictName() + "'失败，字典类型已存在"); } - dictTypeService.updateDictType(dictType); + dictTypeService.updateDictType(dict); return R.ok(); }