【修改】用户字典表启动报错

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

@@ -36,7 +36,7 @@ import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
 
 @Tag(name = "管理后台 - 租户字典数据")
 @RestController
-@RequestMapping("/tenant/dictTenant-data")
+@RequestMapping("/tenant/dict-data")
 @Validated
 public class DictDataTenantController {
 
@@ -45,14 +45,14 @@ public class DictDataTenantController {
 
     @PostMapping("/create")
     @Operation(summary = "新增租户字典数据")
-    @PreAuthorize("@ss.hasPermission('tenant:dictTenant-data:create')")
+    @PreAuthorize("@ss.hasPermission('tenant:dict-data:create')")
     public CommonResult<Long> createDictData(@Valid @RequestBody DictDataTenantSaveReqVO createReqVO) {
         return success(dictDataTenantService.createDictData(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "修改租户字典数据")
-    @PreAuthorize("@ss.hasPermission('tenant:dictTenant-data:update')")
+    @PreAuthorize("@ss.hasPermission('tenant:dict-data:update')")
     public CommonResult<Boolean> updateDictData(@Valid @RequestBody DictDataTenantPageReqVO updateReqVO) {
         dictDataTenantService.updateDictData(updateReqVO);
         return success(true);
@@ -61,7 +61,7 @@ public class DictDataTenantController {
     @DeleteMapping("/delete")
     @Operation(summary = "删除租户字典数据")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('tenant:dictTenant-data:delete')")
+    @PreAuthorize("@ss.hasPermission('tenant:dict-data:delete')")
     public CommonResult<Boolean> deleteDictData(@RequestParam("id") Long id) {
         dictDataTenantService.deleteDictData(id);
         return success(true);
@@ -79,7 +79,7 @@ public class DictDataTenantController {
     @GetMapping("/get")
     @Operation(summary = "获得租户字典数据")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('tenant:dictTenant-data:query')")
+    @PreAuthorize("@ss.hasPermission('tenant:dict-data:query')")
     public CommonResult<DictDataTenantRespVO> getDictData(@RequestParam("id") Long id) {
         DictDataTenantDO dictData = dictDataTenantService.getDictData(id);
         return success(BeanUtils.toBean(dictData, DictDataTenantRespVO.class));
@@ -87,7 +87,7 @@ public class DictDataTenantController {
 
     @GetMapping("/page")
     @Operation(summary = "获得租户字典数据分页")
-    @PreAuthorize("@ss.hasPermission('tenant:dictTenant-data:query')")
+    @PreAuthorize("@ss.hasPermission('tenant:dict-data:query')")
     public CommonResult<PageResult<DictDataTenantRespVO>> getDictDataPage(@Valid DictDataTenantPageReqVO pageReqVO) {
         PageResult<DictDataTenantDO> pageResult = dictDataTenantService.getDictDataPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, DictDataTenantRespVO.class));
@@ -95,7 +95,7 @@ public class DictDataTenantController {
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出租户字典数据 Excel")
-    @PreAuthorize("@ss.hasPermission('tenant:dictTenant-data:export')")
+    @PreAuthorize("@ss.hasPermission('tenant:dict-data:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportDictDataExcel(@Valid DictDataTenantPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {

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

@@ -6,11 +6,11 @@ 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.dal.dataobject.dict.DictTypeDO;
 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;
 import com.google.common.annotations.VisibleForTesting;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -18,7 +18,6 @@ import org.springframework.validation.annotation.Validated;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 
-
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
@@ -34,7 +33,7 @@ import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
  * @author 芋道源码
  */
 @Service
-@Validated
+@Slf4j
 public class DictDataTenantServiceImpl implements DictDataTenantService {
 
     /**

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

@@ -27,7 +27,6 @@ import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
  * @author 芋道源码
  */
 @Service
-@Validated
 public class DictTypeTenantServiceImpl implements DictTypeTenantService {
 
     @Resource