From b38151a0bb0484221ba7b9ad3a1aa773105e1b14 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 06 十二月 2022 11:32:35 +0800
Subject: [PATCH] !260 单元格合并判断cellValue是否相等方法调整 Merge pull request !260 from zendwang/dev

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
index b5b28f2..86840b7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
@@ -11,9 +11,6 @@
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.service.ISysDictTypeService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -27,7 +24,6 @@
  * @author Lion Li
  */
 @Validated
-@Tag(name ="鏁版嵁瀛楀吀淇℃伅鎺у埗鍣�", description = "鏁版嵁瀛楀吀淇℃伅绠＄悊")
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/system/dict/type")
@@ -35,14 +31,18 @@
 
     private final ISysDictTypeService dictTypeService;
 
-    @Operation(summary = "鏌ヨ瀛楀吀绫诲瀷鍒楄〃")
+    /**
+     * 鏌ヨ瀛楀吀绫诲瀷鍒楄〃
+     */
     @SaCheckPermission("system:dict:list")
     @GetMapping("/list")
     public TableDataInfo<SysDictType> list(SysDictType dictType, PageQuery pageQuery) {
         return dictTypeService.selectPageDictTypeList(dictType, pageQuery);
     }
 
-    @Operation(summary = "瀵煎嚭瀛楀吀绫诲瀷鍒楄〃")
+    /**
+     * 瀵煎嚭瀛楀吀绫诲瀷鍒楄〃
+     */
     @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.EXPORT)
     @SaCheckPermission("system:dict:export")
     @PostMapping("/export")
@@ -53,18 +53,18 @@
 
     /**
      * 鏌ヨ瀛楀吀绫诲瀷璇︾粏
+     *
+     * @param dictId 瀛楀吀ID
      */
-    @Operation(summary = "鏌ヨ瀛楀吀绫诲瀷璇︾粏")
     @SaCheckPermission("system:dict:query")
     @GetMapping(value = "/{dictId}")
-    public R<SysDictType> getInfo(@Parameter(name = "瀛楀吀ID") @PathVariable Long dictId) {
+    public R<SysDictType> getInfo(@PathVariable Long dictId) {
         return R.ok(dictTypeService.selectDictTypeById(dictId));
     }
 
     /**
      * 鏂板瀛楀吀绫诲瀷
      */
-    @Operation(summary = "鏂板瀛楀吀绫诲瀷")
     @SaCheckPermission("system:dict:add")
     @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.INSERT)
     @PostMapping
@@ -72,13 +72,13 @@
         if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
             return R.fail("鏂板瀛楀吀'" + dict.getDictName() + "'澶辫触锛屽瓧鍏哥被鍨嬪凡瀛樺湪");
         }
-        return toAjax(dictTypeService.insertDictType(dict));
+        dictTypeService.insertDictType(dict);
+        return R.ok();
     }
 
     /**
      * 淇敼瀛楀吀绫诲瀷
      */
-    @Operation(summary = "淇敼瀛楀吀绫诲瀷")
     @SaCheckPermission("system:dict:edit")
     @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -86,17 +86,19 @@
         if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
             return R.fail("淇敼瀛楀吀'" + dict.getDictName() + "'澶辫触锛屽瓧鍏哥被鍨嬪凡瀛樺湪");
         }
-        return toAjax(dictTypeService.updateDictType(dict));
+        dictTypeService.updateDictType(dict);
+        return R.ok();
     }
 
     /**
      * 鍒犻櫎瀛楀吀绫诲瀷
+     *
+     * @param dictIds 瀛楀吀ID涓�
      */
-    @Operation(summary = "鍒犻櫎瀛楀吀绫诲瀷")
     @SaCheckPermission("system:dict:remove")
     @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictIds}")
-    public R<Void> remove(@Parameter(name = "瀛楀吀ID涓�") @PathVariable Long[] dictIds) {
+    public R<Void> remove(@PathVariable Long[] dictIds) {
         dictTypeService.deleteDictTypeByIds(dictIds);
         return R.ok();
     }
@@ -104,7 +106,6 @@
     /**
      * 鍒锋柊瀛楀吀缂撳瓨
      */
-    @Operation(summary = "鍒锋柊瀛楀吀缂撳瓨")
     @SaCheckPermission("system:dict:remove")
     @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.CLEAN)
     @DeleteMapping("/refreshCache")
@@ -116,7 +117,6 @@
     /**
      * 鑾峰彇瀛楀吀閫夋嫨妗嗗垪琛�
      */
-    @Operation(summary = "鑾峰彇瀛楀吀閫夋嫨妗嗗垪琛�")
     @GetMapping("/optionselect")
     public R<List<SysDictType>> optionselect() {
         List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();

--
Gitblit v1.9.3