Commit 08d72fe9ca0c655974bd43c24142b0c9bad37a6a
Merge remote-tracking branch 'origin/master' into master
Showing
3 changed files
with
6 additions
and
5 deletions
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/controller/dict/SysDictTypeController.java
| @@ -60,7 +60,7 @@ public class SysDictTypeController { | @@ -60,7 +60,7 @@ public class SysDictTypeController { | ||
| 60 | 60 | ||
| 61 | @ApiOperation("/获得字典类型的分页列表") | 61 | @ApiOperation("/获得字典类型的分页列表") |
| 62 | @GetMapping("/page") | 62 | @GetMapping("/page") |
| 63 | - @PreAuthorize("@ss.hasPermission('system:dict:quey')") | 63 | + @PreAuthorize("@ss.hasPermission('system:dict:query')") |
| 64 | public CommonResult<PageResult<SysDictTypeRespVO>> pageDictTypes(@Valid SysDictTypePageReqVO reqVO) { | 64 | public CommonResult<PageResult<SysDictTypeRespVO>> pageDictTypes(@Valid SysDictTypePageReqVO reqVO) { |
| 65 | return success(SysDictTypeConvert.INSTANCE.convertPage(dictTypeService.getDictTypePage(reqVO))); | 65 | return success(SysDictTypeConvert.INSTANCE.convertPage(dictTypeService.getDictTypePage(reqVO))); |
| 66 | } | 66 | } |
| @@ -68,7 +68,7 @@ public class SysDictTypeController { | @@ -68,7 +68,7 @@ public class SysDictTypeController { | ||
| 68 | @ApiOperation("/查询字典类型详细") | 68 | @ApiOperation("/查询字典类型详细") |
| 69 | @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) | 69 | @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) |
| 70 | @GetMapping(value = "/get") | 70 | @GetMapping(value = "/get") |
| 71 | - @PreAuthorize("@ss.hasPermission('system:dict:quey')") | 71 | + @PreAuthorize("@ss.hasPermission('system:dict:query')") |
| 72 | public CommonResult<SysDictTypeRespVO> getDictType(@RequestParam("id") Long id) { | 72 | public CommonResult<SysDictTypeRespVO> getDictType(@RequestParam("id") Long id) { |
| 73 | return success(SysDictTypeConvert.INSTANCE.convert(dictTypeService.getDictType(id))); | 73 | return success(SysDictTypeConvert.INSTANCE.convert(dictTypeService.getDictType(id))); |
| 74 | } | 74 | } |
| @@ -83,7 +83,7 @@ public class SysDictTypeController { | @@ -83,7 +83,7 @@ public class SysDictTypeController { | ||
| 83 | 83 | ||
| 84 | @ApiOperation("导出数据类型") | 84 | @ApiOperation("导出数据类型") |
| 85 | @GetMapping("/export") | 85 | @GetMapping("/export") |
| 86 | - @PreAuthorize("@ss.hasPermission('system:dict:quey')") | 86 | + @PreAuthorize("@ss.hasPermission('system:dict:query')") |
| 87 | @OperateLog(type = EXPORT) | 87 | @OperateLog(type = EXPORT) |
| 88 | public void export(HttpServletResponse response, @Valid SysDictTypeExportReqVO reqVO) throws IOException { | 88 | public void export(HttpServletResponse response, @Valid SysDictTypeExportReqVO reqVO) throws IOException { |
| 89 | List<SysDictTypeDO> list = dictTypeService.getDictTypeList(reqVO); | 89 | List<SysDictTypeDO> list = dictTypeService.getDictTypeList(reqVO); |
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/controller/notice/SysNoticeController.java
| @@ -56,7 +56,7 @@ public class SysNoticeController { | @@ -56,7 +56,7 @@ public class SysNoticeController { | ||
| 56 | 56 | ||
| 57 | @GetMapping("/page") | 57 | @GetMapping("/page") |
| 58 | @ApiOperation("获取通知公告列表") | 58 | @ApiOperation("获取通知公告列表") |
| 59 | - @PreAuthorize("@ss.hasPermission('system:notice:quey')") | 59 | + @PreAuthorize("@ss.hasPermission('system:notice:query')") |
| 60 | public CommonResult<PageResult<SysNoticeRespVO>> pageNotices(@Validated SysNoticePageReqVO reqVO) { | 60 | public CommonResult<PageResult<SysNoticeRespVO>> pageNotices(@Validated SysNoticePageReqVO reqVO) { |
| 61 | return success(SysNoticeConvert.INSTANCE.convertPage(noticeService.pageNotices(reqVO))); | 61 | return success(SysNoticeConvert.INSTANCE.convertPage(noticeService.pageNotices(reqVO))); |
| 62 | } | 62 | } |
| @@ -64,7 +64,7 @@ public class SysNoticeController { | @@ -64,7 +64,7 @@ public class SysNoticeController { | ||
| 64 | @GetMapping("/get") | 64 | @GetMapping("/get") |
| 65 | @ApiOperation("获得通知公告") | 65 | @ApiOperation("获得通知公告") |
| 66 | @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) | 66 | @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) |
| 67 | - @PreAuthorize("@ss.hasPermission('system:notice:quey')") | 67 | + @PreAuthorize("@ss.hasPermission('system:notice:query')") |
| 68 | public CommonResult<SysNoticeRespVO> getNotice(@RequestParam("id") Long id) { | 68 | public CommonResult<SysNoticeRespVO> getNotice(@RequestParam("id") Long id) { |
| 69 | return success(SysNoticeConvert.INSTANCE.convert(noticeService.getNotice(id))); | 69 | return success(SysNoticeConvert.INSTANCE.convert(noticeService.getNotice(id))); |
| 70 | } | 70 | } |