1、租户字典接口调整

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dictTenant/DictDataTenantController.java

@@ -6,8 +6,11 @@ import cn.iocoder.yudao.module.system.controller.admin.dictTenant.vo.data.DictDa
 import cn.iocoder.yudao.module.system.controller.admin.dictTenant.vo.data.DictDataTenantRespVO;
 import cn.iocoder.yudao.module.system.controller.admin.dictTenant.vo.data.DictDataTenantSaveReqVO;
 
+import cn.iocoder.yudao.module.system.controller.admin.dictTenant.vo.data.DictDataTenantUpdateReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dictTenant.DictDataTenantDO;
 import cn.iocoder.yudao.module.system.service.dictTenant.DictDataTenantService;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import org.springdoc.api.annotations.ParameterObject;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -36,7 +39,7 @@ import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
 
 @Tag(name = "管理后台 - 租户字典数据")
 @RestController
-@RequestMapping("/tenant/dict-data")
+@RequestMapping("/system/tenant/dict-data")
 @Validated
 public class DictDataTenantController {
 
@@ -45,6 +48,7 @@ public class DictDataTenantController {
 
     @PostMapping("/create")
     @Operation(summary = "新增租户字典数据")
+    @ApiOperationSupport(order = 1)
     @PreAuthorize("@ss.hasPermission('tenant:dict-data:create')")
     public CommonResult<Long> createDictData(@Valid @RequestBody DictDataTenantSaveReqVO createReqVO) {
         return success(dictDataTenantService.createDictData(createReqVO));
@@ -52,14 +56,16 @@ public class DictDataTenantController {
 
     @PutMapping("/update")
     @Operation(summary = "修改租户字典数据")
+    @ApiOperationSupport(order = 2)
     @PreAuthorize("@ss.hasPermission('tenant:dict-data:update')")
-    public CommonResult<Boolean> updateDictData(@Valid @RequestBody DictDataTenantPageReqVO updateReqVO) {
+    public CommonResult<Boolean> updateDictData(@Valid @RequestBody DictDataTenantUpdateReqVO updateReqVO) {
         dictDataTenantService.updateDictData(updateReqVO);
         return success(true);
     }
 
     @DeleteMapping("/delete")
     @Operation(summary = "删除租户字典数据")
+    @ApiOperationSupport(order = 3)
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('tenant:dict-data:delete')")
     public CommonResult<Boolean> deleteDictData(@RequestParam("id") Long id) {
@@ -67,17 +73,9 @@ public class DictDataTenantController {
         return success(true);
     }
 
-    @GetMapping(value = {"/list-all-simple", "simple-list"})
-    @Operation(summary = "获得全部字典数据列表", description = "一般用于管理后台缓存字典数据在本地")
-    // 无需添加权限认证，因为前端全局都需要
-    public CommonResult<List<DictDataSimpleRespVO>> getSimpleDictDataList() {
-        List<DictDataTenantDO> list = dictDataTenantService.getDictDataList(
-                CommonStatusEnum.ENABLE.getStatus(), null);
-        return success(BeanUtils.toBean(list, DictDataSimpleRespVO.class));
-    }
-
     @GetMapping("/get")
     @Operation(summary = "获得租户字典数据")
+    @ApiOperationSupport(order = 4)
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('tenant:dict-data:query')")
     public CommonResult<DictDataTenantRespVO> getDictData(@RequestParam("id") Long id) {
@@ -87,17 +85,19 @@ public class DictDataTenantController {
 
     @GetMapping("/page")
     @Operation(summary = "获得租户字典数据分页")
+    @ApiOperationSupport(order = 5)
     @PreAuthorize("@ss.hasPermission('tenant:dict-data:query')")
-    public CommonResult<PageResult<DictDataTenantRespVO>> getDictDataPage(@Valid DictDataTenantPageReqVO pageReqVO) {
+    public CommonResult<PageResult<DictDataTenantRespVO>> getDictDataPage(@Valid @ParameterObject DictDataTenantPageReqVO pageReqVO) {
         PageResult<DictDataTenantDO> pageResult = dictDataTenantService.getDictDataPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, DictDataTenantRespVO.class));
     }
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出租户字典数据 Excel")
+    @ApiOperationSupport(order = 6)
     @PreAuthorize("@ss.hasPermission('tenant:dict-data:export')")
     @ApiAccessLog(operateType = EXPORT)
-    public void exportDictDataExcel(@Valid DictDataTenantPageReqVO pageReqVO,
+    public void exportDictDataExcel(@Valid @ParameterObject DictDataTenantPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<DictDataTenantDO> list = dictDataTenantService.getDictDataPage(pageReqVO).getList();
@@ -106,4 +106,14 @@ public class DictDataTenantController {
                         BeanUtils.toBean(list, DictDataTenantRespVO.class));
     }
 
+    @GetMapping(value = {"/list-all-simple", "simple-list"})
+    @Operation(summary = "获得全部字典数据列表", description = "一般用于管理后台缓存字典数据在本地")
+    @ApiOperationSupport(order = 7)
+    // 无需添加权限认证，因为前端全局都需要
+    public CommonResult<List<DictDataSimpleRespVO>> getSimpleDictDataList() {
+        List<DictDataTenantDO> list = dictDataTenantService.getDictDataList(
+                CommonStatusEnum.ENABLE.getStatus(), null);
+        return success(BeanUtils.toBean(list, DictDataSimpleRespVO.class));
+    }
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dictTenant/DictTypeTenantController.java

@@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.system.controller.admin.dictTenant.vo.type.DictTy
 import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictTypeDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dictTenant.DictTypeTenantDO;
 import cn.iocoder.yudao.module.system.service.dictTenant.DictTypeTenantService;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import org.springdoc.api.annotations.ParameterObject;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -34,7 +36,7 @@ import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
 
 @Tag(name = "管理后台 - 租户字典类型")
 @RestController
-@RequestMapping("/tenant/dict-type")
+@RequestMapping("/system/tenant/dict-type")
 @Validated
 public class DictTypeTenantController {
 
@@ -43,6 +45,7 @@ public class DictTypeTenantController {
 
     @PostMapping("/create")
     @Operation(summary = "创建租户字典类型")
+    @ApiOperationSupport(order = 1)
     @PreAuthorize("@ss.hasPermission('tenant:dict-type:create')")
     public CommonResult<Long> createDictType(@Valid @RequestBody DictTypeTenantSaveReqVO createReqVO) {
         return success(dictTypeTenantService.createDictType(createReqVO));
@@ -50,6 +53,7 @@ public class DictTypeTenantController {
 
     @PutMapping("/update")
     @Operation(summary = "更新租户字典类型")
+    @ApiOperationSupport(order = 2)
     @PreAuthorize("@ss.hasPermission('tenant:dict-type:update')")
     public CommonResult<Boolean> updateDictType(@Valid @RequestBody DictTypeTenantSaveReqVO updateReqVO) {
         dictTypeTenantService.updateDictType(updateReqVO);
@@ -58,6 +62,7 @@ public class DictTypeTenantController {
 
     @DeleteMapping("/delete")
     @Operation(summary = "删除租户字典类型")
+    @ApiOperationSupport(order = 3)
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('tenant:dict-type:delete')")
     public CommonResult<Boolean> deleteDictType(@RequestParam("id") Long id) {
@@ -67,6 +72,7 @@ public class DictTypeTenantController {
 
     @GetMapping("/get")
     @Operation(summary = "获得租户字典类型")
+    @ApiOperationSupport(order = 4)
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('tenant:dict-type:query')")
     public CommonResult<DictTypeTenantRespVO> getDictType(@RequestParam("id") Long id) {
@@ -76,17 +82,19 @@ public class DictTypeTenantController {
 
     @GetMapping("/page")
     @Operation(summary = "获得租户字典类型分页")
+    @ApiOperationSupport(order = 5)
     @PreAuthorize("@ss.hasPermission('tenant:dict-type:query')")
-    public CommonResult<PageResult<DictTypeTenantRespVO>> getDictTypePage(@Valid DictTypeTenantPageReqVO pageReqVO) {
+    public CommonResult<PageResult<DictTypeTenantRespVO>> getDictTypePage(@Valid @ParameterObject DictTypeTenantPageReqVO pageReqVO) {
         PageResult<DictTypeTenantDO> pageResult = dictTypeTenantService.getDictTypePage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, DictTypeTenantRespVO.class));
     }
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出租户字典类型 Excel")
+    @ApiOperationSupport(order = 6)
     @PreAuthorize("@ss.hasPermission('tenant:dict-type:export')")
     @ApiAccessLog(operateType = EXPORT)
-    public void exportDictTypeExcel(@Valid DictTypeTenantPageReqVO pageReqVO,
+    public void exportDictTypeExcel(@Valid @ParameterObject DictTypeTenantPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<DictTypeTenantDO> list = dictTypeTenantService.getDictTypePage(pageReqVO).getList();

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dictTenant/vo/data/DictDataTenantPageReqVO.java

@@ -14,35 +14,12 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @ToString(callSuper = true)
 public class DictDataTenantPageReqVO extends PageParam {
 
-    @Schema(description = "字典数据编号", example = "1024")
-    private Long id;
-
-    @Schema(description = "字典排序")
-    private Integer sort;
-
-    @Schema(description = "字典标签")
+    @Schema(description = "字典标签", example = "年假")
     private String label;
 
-    @Schema(description = "字典键值")
-    private String value;
-
-    @Schema(description = "字典类型", example = "2")
+    @Schema(description = "字典类型", example = "bpm_oa_leave_tenant")
     private String dictType;
 
-    @Schema(description = "状态（0正常 1停用）", example = "2")
+    @Schema(description = "状态（0正常 1停用）", example = "0")
     private Integer status;
-
-    @Schema(description = "颜色类型", example = "2")
-    private String colorType;
-
-    @Schema(description = "css 样式")
-    private String cssClass;
-
-    @Schema(description = "备注", example = "随便")
-    private String remark;
-
-    @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
-
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dictTenant/vo/data/DictDataTenantRespVO.java

@@ -11,31 +11,31 @@ import com.alibaba.excel.annotation.*;
 @ExcelIgnoreUnannotated
 public class DictDataTenantRespVO {
 
-    @Schema(description = "字典编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "25421")
+    @Schema(description = "字典编码")
     @ExcelProperty("字典编码")
     private Long id;
 
-    @Schema(description = "字典排序", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "字典排序")
     @ExcelProperty("字典排序")
     private Integer sort;
 
-    @Schema(description = "字典标签", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "字典标签")
     @ExcelProperty("字典标签")
     private String label;
 
-    @Schema(description = "字典键值", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "字典键值")
     @ExcelProperty("字典键值")
     private String value;
 
-    @Schema(description = "字典类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @Schema(description = "字典类型")
     @ExcelProperty("字典类型")
     private String dictType;
 
-    @Schema(description = "状态（0正常 1停用）", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @Schema(description = "状态（0正常 1停用）")
     @ExcelProperty("状态（0正常 1停用）")
     private Integer status;
 
-    @Schema(description = "颜色类型", example = "2")
+    @Schema(description = "颜色类型")
     @ExcelProperty("颜色类型")
     private String colorType;
 
@@ -43,11 +43,11 @@ public class DictDataTenantRespVO {
     @ExcelProperty("css 样式")
     private String cssClass;
 
-    @Schema(description = "备注", example = "随便")
+    @Schema(description = "备注")
     @ExcelProperty("备注")
     private String remark;
 
-    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "创建时间")
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dictTenant/vo/data/DictDataTenantSaveReqVO.java

@@ -9,35 +9,20 @@ import javax.validation.constraints.*;
 @Data
 public class DictDataTenantSaveReqVO {
 
-    @Schema(description = "字典编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "25421")
-    private Long id;
-
-    @Schema(description = "字典排序", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "字典排序不能为空")
+    @Schema(description = "字典排序，默认0", example = "0")
     private Integer sort;
 
-    @Schema(description = "字典标签", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "字典标签不能为空")
+    @Schema(description = "字典数据", requiredMode = Schema.RequiredMode.REQUIRED, example = "年假")
+    @NotBlank(message = "字典数据不能为空")
     private String label;
 
-    @Schema(description = "字典键值", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "字典键值不能为空")
-    private String value;
-
-    @Schema(description = "字典类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @NotEmpty(message = "字典类型不能为空")
+    @Schema(description = "字典类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "bpm_oa_leave_type_tenant")
+    @NotBlank(message = "字典类型不能为空")
     private String dictType;
 
-    @Schema(description = "状态（0正常 1停用）", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @NotNull(message = "状态（0正常 1停用）不能为空")
+    @Schema(description = "状态（0正常 1停用），默认0正常", example = "0")
     private Integer status;
 
-    @Schema(description = "颜色类型", example = "2")
-    private String colorType;
-
-    @Schema(description = "css 样式")
-    private String cssClass;
-
     @Schema(description = "备注", example = "随便")
     private String remark;
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dictTenant/vo/data/DictDataTenantUpdateReqVO.java

@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.system.controller.admin.dictTenant.vo.data;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "管理后台 - 租户字典数据修改 Request VO")
+@Data
+public class DictDataTenantUpdateReqVO {
+
+    @Schema(description = "字典数据id", example = "1")
+    @NotNull(message = "字典数据id不能为空")
+    private Long id;
+
+    @Schema(description = "字典排序", example = "0")
+    private Integer sort;
+
+    @Schema(description = "字典数据", requiredMode = Schema.RequiredMode.REQUIRED, example = "年假")
+    @NotEmpty(message = "字典数据不能为空")
+    private String label;
+
+    @Schema(description = "状态（0正常 1停用）", example = "0")
+    private Integer status;
+
+    @Schema(description = "备注", example = "随便")
+    private String remark;
+
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dictTenant/vo/type/DictTypeTenantPageReqVO.java

@@ -14,24 +14,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @ToString(callSuper = true)
 public class DictTypeTenantPageReqVO extends PageParam {
 
-    @Schema(description = "字典名称", example = "张三")
+    @Schema(description = "字典名称", example = "请假类型")
     private String name;
 
-    @Schema(description = "字典类型", example = "1")
-    private String type;
-
-    @Schema(description = "状态（0正常 1停用）", example = "2")
-    private Integer status;
-
-    @Schema(description = "备注", example = "你说的对")
-    private String remark;
-
-    @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
-
-    @Schema(description = "删除时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] deletedTime;
-
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dictTenant/vo/type/DictTypeTenantSaveReqVO.java

@@ -10,25 +10,21 @@ import java.time.LocalDateTime;
 @Data
 public class DictTypeTenantSaveReqVO {
 
-    @Schema(description = "字典主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "10945")
+    @Schema(description = "字典主键")
     private Long id;
 
-    @Schema(description = "字典名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @Schema(description = "字典名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "请假类型")
     @NotEmpty(message = "字典名称不能为空")
     private String name;
 
-    @Schema(description = "字典类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "字典类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "bpm_oa_leave_type_tenant")
     @NotEmpty(message = "字典类型不能为空")
     private String type;
 
-    @Schema(description = "状态（0正常 1停用）", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @Schema(description = "状态（0正常 1停用）", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
     @NotNull(message = "状态（0正常 1停用）不能为空")
     private Integer status;
 
     @Schema(description = "备注", example = "你说的对")
     private String remark;
-
-    @Schema(description = "删除时间")
-    private LocalDateTime deletedTime;
-
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dictTenant/DictDataTenantMapper.java

@@ -26,16 +26,12 @@ public interface DictDataTenantMapper extends BaseMapperX<DictDataTenantDO> {
 
     default PageResult<DictDataTenantDO> selectPage(DictDataTenantPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<DictDataTenantDO>()
-                .eqIfPresent(DictDataTenantDO::getSort, reqVO.getSort())
-                .eqIfPresent(DictDataTenantDO::getLabel, reqVO.getLabel())
-                .eqIfPresent(DictDataTenantDO::getValue, reqVO.getValue())
+                .likeIfPresent(DictDataTenantDO::getLabel, reqVO.getLabel())
                 .eqIfPresent(DictDataTenantDO::getDictType, reqVO.getDictType())
                 .eqIfPresent(DictDataTenantDO::getStatus, reqVO.getStatus())
-                .eqIfPresent(DictDataTenantDO::getColorType, reqVO.getColorType())
-                .eqIfPresent(DictDataTenantDO::getCssClass, reqVO.getCssClass())
-                .eqIfPresent(DictDataTenantDO::getRemark, reqVO.getRemark())
-                .betweenIfPresent(DictDataTenantDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(DictDataTenantDO::getId));
+                .orderByAsc(DictDataTenantDO::getDictType)
+                .orderByAsc(DictDataTenantDO::getSort)
+                .orderByAsc(DictDataTenantDO::getId));
     }
 
     default List<DictDataTenantDO> selectListByStatusAndDictType(Integer status, String dictType) {

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dictTenant/DictTypeTenantMapper.java

@@ -25,11 +25,6 @@ public interface DictTypeTenantMapper extends BaseMapperX<DictTypeTenantDO> {
     default PageResult<DictTypeTenantDO> selectPage(DictTypeTenantPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<DictTypeTenantDO>()
                 .likeIfPresent(DictTypeTenantDO::getName, reqVO.getName())
-                .eqIfPresent(DictTypeTenantDO::getType, reqVO.getType())
-                .eqIfPresent(DictTypeTenantDO::getStatus, reqVO.getStatus())
-                .eqIfPresent(DictTypeTenantDO::getRemark, reqVO.getRemark())
-                .betweenIfPresent(DictTypeTenantDO::getCreateTime, reqVO.getCreateTime())
-                .betweenIfPresent(DictTypeTenantDO::getDeletedTime, reqVO.getDeletedTime())
                 .orderByDesc(DictTypeTenantDO::getId));
     }
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dictTenant/DictDataTenantService.java

@@ -8,6 +8,7 @@ import cn.iocoder.yudao.module.system.controller.admin.dictTenant.vo.data.DictDa
 import cn.iocoder.yudao.module.system.controller.admin.dictTenant.vo.data.DictDataTenantSaveReqVO;
 
 
+import cn.iocoder.yudao.module.system.controller.admin.dictTenant.vo.data.DictDataTenantUpdateReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dictTenant.DictDataTenantDO;
 import org.springframework.lang.Nullable;
 
@@ -34,7 +35,7 @@ public interface DictDataTenantService {
      *
      * @param updateReqVO 更新信息
      */
-    void updateDictData(@Valid DictDataTenantPageReqVO updateReqVO);
+    void updateDictData(@Valid DictDataTenantUpdateReqVO updateReqVO);
 
     /**
      * 删除租户字典数据

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dictTenant/DictDataTenantServiceImpl.java

@@ -1,11 +1,13 @@
 package cn.iocoder.yudao.module.system.service.dictTenant;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.module.system.controller.admin.dictTenant.vo.data.DictDataTenantPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.dictTenant.vo.data.DictDataTenantSaveReqVO;
 
+import cn.iocoder.yudao.module.system.controller.admin.dictTenant.vo.data.DictDataTenantUpdateReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dictTenant.DictDataTenantDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dictTenant.DictTypeTenantDO;
 import cn.iocoder.yudao.module.system.dal.mysql.dictTenant.DictDataTenantMapper;
@@ -13,6 +15,8 @@ import com.google.common.annotations.VisibleForTesting;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
+
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -70,26 +74,40 @@ public class DictDataTenantServiceImpl implements DictDataTenantService {
 
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Long createDictData(DictDataTenantSaveReqVO createReqVO) {
         // 校验字典类型有效
         validateDictTypeExists(createReqVO.getDictType());
         // 校验字典数据的值的唯一性
-        validateDictDataValueUnique(null, createReqVO.getDictType(), createReqVO.getValue());
+        // validateDictDataValueUnique(null, createReqVO.getDictType(), createReqVO.getValue());
 
         // 插入字典类型
         DictDataTenantDO dictData = BeanUtils.toBean(createReqVO, DictDataTenantDO.class);
+        if (dictData.getSort() == null) {
+            // 字典排序，默认为0
+            dictData.setSort(0);
+        }
+        if (StrUtil.isBlank(dictData.getColorType())) {
+            dictData.setColorType("default");
+        }
         dictDataTenantMapper.insert(dictData);
+        // 自动更新数据的值和id一致
+        DictDataTenantDO build = DictDataTenantDO.builder()
+                .id(dictData.getId())
+                .value(String.valueOf(dictData.getId()))
+                .build();
+        dictDataTenantMapper.updateById(build);
         return dictData.getId();
     }
 
     @Override
-    public void updateDictData(DictDataTenantPageReqVO updateReqVO) {
+    public void updateDictData(DictDataTenantUpdateReqVO updateReqVO) {
         // 校验自己存在
         validateDictDataExists(updateReqVO.getId());
         // 校验字典类型有效
-        validateDictTypeExists(updateReqVO.getDictType());
+        // validateDictTypeExists(updateReqVO.getDictType());
         // 校验字典数据的值的唯一性
-        validateDictDataValueUnique(updateReqVO.getId(), updateReqVO.getDictType(), updateReqVO.getValue());
+        // validateDictDataValueUnique(updateReqVO.getId(), updateReqVO.getDictType(), updateReqVO.getValue());
 
         // 更新字典类型
         DictDataTenantDO updateObj = BeanUtils.toBean(updateReqVO, DictDataTenantDO.class);