From 8c6f95148df8710797eb924561b9dc30ab51eca9 Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Fri, 2 Aug 2024 23:27:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=E6=96=B0=E5=A2=9E=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=97=B6=EF=BC=8C=E6=A0=A1=E9=AA=8C=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E8=B7=AF=E7=94=B1=E5=90=8D=E7=A7=B0=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

新增菜单时，校验菜单的路由名称是否重复
新增按钮权限时，不影响
---
 .../com/youlai/system/service/impl/SysMenuServiceImpl.java  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java
index b6f859d3..1666e86c 100644
--- a/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java
+++ b/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java
@@ -255,6 +255,12 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
         } else {
             entity.setParams(null);
         }
+        if(menuType != MenuTypeEnum.BUTTON){
+            Assert.isTrue(this.count(new LambdaQueryWrapper<SysMenu>()
+                    .eq(SysMenu::getRouteName, entity.getRouteName())
+                    .ne(menuForm.getId() != null, SysMenu::getId, menuForm.getId())
+            ) == 0, "路由名称已存在");
+        }
 
         boolean result = this.saveOrUpdate(entity);
         if (result) {

From e694ac5bb734c50942801201603f5bbaf2c33ace Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Fri, 2 Aug 2024 23:43:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?style:=20=E8=BF=94=E5=9B=9E=E5=80=BC?=
 =?UTF-8?q?=E8=AD=A6=E5=91=8A=E6=B6=88=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

返回值警告消除
由 Result 为  Result<?>
由 Option 为 Option<Type>
---
 .../youlai/system/common/model/Option.java    |  4 ++--
 .../system/controller/AuthController.java     |  2 +-
 .../system/controller/FileController.java     |  2 +-
 .../controller/GeneratorController.java       |  6 ++---
 .../system/controller/SysDeptController.java  | 10 ++++-----
 .../system/controller/SysDictController.java  | 14 ++++++------
 .../system/controller/SysMenuController.java  | 10 ++++-----
 .../system/controller/SysRoleController.java  | 14 ++++++------
 .../system/controller/SysUserController.java  | 12 +++++-----
 .../system/converter/DictItemConverter.java   |  4 ++--
 .../system/converter/GenConfigConverter.java  |  1 -
 .../system/converter/RoleConverter.java       |  5 ++---
 .../system/converter/SysConfigConverter.java  |  1 +
 .../youlai/system/service/SysDeptService.java | 22 +++++++++----------
 .../youlai/system/service/SysDictService.java |  4 ++--
 .../youlai/system/service/SysRoleService.java |  2 +-
 .../service/impl/SysDeptServiceImpl.java      | 13 ++++++-----
 .../service/impl/SysDictServiceImpl.java      |  6 ++---
 .../service/impl/SysMenuServiceImpl.java      |  4 ++--
 .../service/impl/SysRoleServiceImpl.java      |  2 +-
 20 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/src/main/java/com/youlai/system/common/model/Option.java b/src/main/java/com/youlai/system/common/model/Option.java
index 3d43761c..e083c9b3 100644
--- a/src/main/java/com/youlai/system/common/model/Option.java
+++ b/src/main/java/com/youlai/system/common/model/Option.java
@@ -23,7 +23,7 @@ public class Option<T> {
         this.label = label;
     }
 
-    public Option(T value, String label, List<Option> children) {
+    public Option(T value, String label, List<Option<T>> children) {
         this.value = value;
         this.label = label;
         this.children= children;
@@ -37,6 +37,6 @@ public class Option<T> {
 
     @Schema(description="子选项列表")
     @JsonInclude(value = JsonInclude.Include.NON_EMPTY)
-    private List<Option> children;
+    private List<Option<T>> children;
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/youlai/system/controller/AuthController.java b/src/main/java/com/youlai/system/controller/AuthController.java
index 6c053733..51685c32 100644
--- a/src/main/java/com/youlai/system/controller/AuthController.java
+++ b/src/main/java/com/youlai/system/controller/AuthController.java
@@ -42,7 +42,7 @@ public class AuthController {
     @Operation(summary = "注销")
     @DeleteMapping("/logout")
     @LogAnnotation(value = "注销", module = LogModuleEnum.LOGIN)
-    public Result logout() {
+    public Result<?> logout() {
         authService.logout();
         return Result.success();
     }
diff --git a/src/main/java/com/youlai/system/controller/FileController.java b/src/main/java/com/youlai/system/controller/FileController.java
index c64711df..26f77894 100644
--- a/src/main/java/com/youlai/system/controller/FileController.java
+++ b/src/main/java/com/youlai/system/controller/FileController.java
@@ -37,7 +37,7 @@ public class FileController {
     @DeleteMapping
     @Operation(summary = "文件删除")
     @SneakyThrows
-    public Result deleteFile(
+    public Result<?> deleteFile(
             @Parameter(description = "文件路径") @RequestParam String filePath
     ) {
         boolean result = ossService.deleteFile(filePath);
diff --git a/src/main/java/com/youlai/system/controller/GeneratorController.java b/src/main/java/com/youlai/system/controller/GeneratorController.java
index 43c55d83..904f4508 100644
--- a/src/main/java/com/youlai/system/controller/GeneratorController.java
+++ b/src/main/java/com/youlai/system/controller/GeneratorController.java
@@ -57,14 +57,14 @@ public class GeneratorController {
     @Operation(summary = "保存代码生成配置")
     @PostMapping("/{tableName}/config")
     @LogAnnotation(value = "生成代码", module = LogModuleEnum.OTHER)
-    public Result saveGenConfig(@RequestBody GenConfigForm formData) {
+    public Result<?> saveGenConfig(@RequestBody GenConfigForm formData) {
         generatorService.saveGenConfig(formData);
         return Result.success();
     }
 
     @Operation(summary = "删除代码生成配置")
     @DeleteMapping("/{tableName}/config")
-    public Result deleteGenConfig(
+    public Result<?> deleteGenConfig(
             @Parameter(description = "表名", example = "sys_user") @PathVariable String tableName
     ) {
         generatorService.deleteGenConfig(tableName);
@@ -87,7 +87,7 @@ public class GeneratorController {
         byte[] data = generatorService.downloadCode(tableNames);
         response.reset();
         response.setHeader("Content-Disposition", "attachment; filename=\"youlai-admin-code.zip\"");
-        response.addHeader("Content-Length", "" + data.length);
+        response.addHeader("Content-Length", String.valueOf(data.length));
         response.addHeader("Access-Control-Allow-Origin", "*");
         response.setHeader("Pragma", "no-cache");
         response.setHeader("Cache-Control", "no-cache");
diff --git a/src/main/java/com/youlai/system/controller/SysDeptController.java b/src/main/java/com/youlai/system/controller/SysDeptController.java
index b7ac282a..6aa9d5a8 100644
--- a/src/main/java/com/youlai/system/controller/SysDeptController.java
+++ b/src/main/java/com/youlai/system/controller/SysDeptController.java
@@ -45,8 +45,8 @@ public class SysDeptController {
 
     @Operation(summary = "部门下拉列表")
     @GetMapping("/options")
-    public Result<List<Option>> getDeptOptions() {
-        List<Option> list = deptService.listDeptOptions();
+    public Result<List<Option<Long>>> getDeptOptions() {
+        List<Option<Long>> list = deptService.listDeptOptions();
         return Result.success(list);
     }
 
@@ -54,7 +54,7 @@ public class SysDeptController {
     @PostMapping
     @PreAuthorize("@ss.hasPerm('sys:dept:add')")
     @PreventRepeatSubmit
-    public Result saveDept(
+    public Result<?> saveDept(
             @Valid @RequestBody DeptForm formData
     ) {
         Long id = deptService.saveDept(formData);
@@ -73,7 +73,7 @@ public class SysDeptController {
     @Operation(summary = "修改部门")
     @PutMapping(value = "/{deptId}")
     @PreAuthorize("@ss.hasPerm('sys:dept:edit')")
-    public Result updateDept(
+    public Result<?> updateDept(
             @PathVariable Long deptId,
             @Valid @RequestBody DeptForm formData
     ) {
@@ -84,7 +84,7 @@ public class SysDeptController {
     @Operation(summary = "删除部门")
     @DeleteMapping("/{ids}")
     @PreAuthorize("@ss.hasPerm('sys:dept:delete')")
-    public Result deleteDepartments(
+    public Result<?> deleteDepartments(
             @Parameter(description ="部门ID，多个以英文逗号(,)分割") @PathVariable("ids") String ids
     ) {
         boolean result = deptService.deleteByIds(ids);
diff --git a/src/main/java/com/youlai/system/controller/SysDictController.java b/src/main/java/com/youlai/system/controller/SysDictController.java
index 811ea999..0023f049 100644
--- a/src/main/java/com/youlai/system/controller/SysDictController.java
+++ b/src/main/java/com/youlai/system/controller/SysDictController.java
@@ -46,17 +46,17 @@ public class SysDictController {
 
     @Operation(summary = "字典列表")
     @GetMapping("/list")
-    public Result<List<Option>> getDictList() {
-        List<Option> list = dictService.getDictList();
+    public Result<List<Option<String>>> getDictList() {
+        List<Option<String>> list = dictService.getDictList();
         return Result.success(list);
     }
 
     @Operation(summary = "字典数据项列表")
     @GetMapping("/{code}/options")
-    public Result<List<Option>> getDictOptions(
+    public Result<List<Option<Long>>> getDictOptions(
             @Parameter(description = "字典编码") @PathVariable String code
     ) {
-        List<Option> options = dictService.listDictItemsByCode(code);
+        List<Option<Long>> options = dictService.listDictItemsByCode(code);
         return Result.success(options);
     }
 
@@ -73,7 +73,7 @@ public class SysDictController {
     @PostMapping
     @PreAuthorize("@ss.hasPerm('sys:dict:add')")
     @PreventRepeatSubmit
-    public Result saveDict(@RequestBody DictForm formData) {
+    public Result<?> saveDict(@RequestBody DictForm formData) {
         boolean result = dictService.saveDict(formData);
         return Result.judge(result);
     }
@@ -81,7 +81,7 @@ public class SysDictController {
     @Operation(summary = "修改字典")
     @PutMapping("/{id}")
     @PreAuthorize("@ss.hasPerm('sys:dict:edit')")
-    public Result updateDict(
+    public Result<?> updateDict(
             @PathVariable Long id,
             @RequestBody DictForm DictForm
     ) {
@@ -92,7 +92,7 @@ public class SysDictController {
     @Operation(summary = "删除字典")
     @DeleteMapping("/{ids}")
     @PreAuthorize("@ss.hasPerm('sys:dict:delete')")
-    public Result deleteDictionaries(
+    public Result<?> deleteDictionaries(
             @Parameter(description = "字典ID，多个以英文逗号(,)拼接") @PathVariable String ids
     ) {
         dictService.deleteDictByIds(ids);
diff --git a/src/main/java/com/youlai/system/controller/SysMenuController.java b/src/main/java/com/youlai/system/controller/SysMenuController.java
index 6a63b2af..fb558cca 100644
--- a/src/main/java/com/youlai/system/controller/SysMenuController.java
+++ b/src/main/java/com/youlai/system/controller/SysMenuController.java
@@ -47,7 +47,7 @@ public class SysMenuController {
 
     @Operation(summary = "菜单下拉列表")
     @GetMapping("/options")
-    public Result listMenuOptions(
+    public Result<?> listMenuOptions(
           @Parameter(description = "是否只查询父级菜单")
           @RequestParam(required = false, defaultValue = "false") boolean onlyParent
     ) {
@@ -76,7 +76,7 @@ public class SysMenuController {
     @PostMapping
     @PreAuthorize("@ss.hasPerm('sys:menu:add')")
     @PreventRepeatSubmit
-    public Result addMenu(@RequestBody MenuForm menuForm) {
+    public Result<?> addMenu(@RequestBody MenuForm menuForm) {
         boolean result = menuService.saveMenu(menuForm);
         return Result.judge(result);
     }
@@ -84,7 +84,7 @@ public class SysMenuController {
     @Operation(summary = "修改菜单")
     @PutMapping(value = "/{id}")
     @PreAuthorize("@ss.hasPerm('sys:menu:edit')")
-    public Result updateMenu(
+    public Result<?> updateMenu(
             @RequestBody MenuForm menuForm
     ) {
         boolean result = menuService.saveMenu(menuForm);
@@ -94,7 +94,7 @@ public class SysMenuController {
     @Operation(summary = "删除菜单")
     @DeleteMapping("/{id}")
     @PreAuthorize("@ss.hasPerm('sys:menu:delete')")
-    public Result deleteMenu(
+    public Result<?> deleteMenu(
             @Parameter(description = "菜单ID，多个以英文(,)分割") @PathVariable("id") Long id
     ) {
         boolean result = menuService.deleteMenu(id);
@@ -103,7 +103,7 @@ public class SysMenuController {
 
     @Operation(summary = "修改菜单显示状态")
     @PatchMapping("/{menuId}")
-    public Result updateMenuVisible(
+    public Result<?> updateMenuVisible(
             @Parameter(description = "菜单ID") @PathVariable Long menuId,
             @Parameter(description = "显示状态(1:显示;0:隐藏)") Integer visible
 
diff --git a/src/main/java/com/youlai/system/controller/SysRoleController.java b/src/main/java/com/youlai/system/controller/SysRoleController.java
index 0230f7bb..61e8590b 100644
--- a/src/main/java/com/youlai/system/controller/SysRoleController.java
+++ b/src/main/java/com/youlai/system/controller/SysRoleController.java
@@ -49,8 +49,8 @@ public class SysRoleController {
 
     @Operation(summary = "角色下拉列表")
     @GetMapping("/options")
-    public Result<List<Option>> listRoleOptions() {
-        List<Option> list = roleService.listRoleOptions();
+    public Result<List<Option<Long>>> listRoleOptions() {
+        List<Option<Long>> list = roleService.listRoleOptions();
         return Result.success(list);
     }
 
@@ -58,7 +58,7 @@ public class SysRoleController {
     @PostMapping
     @PreAuthorize("@ss.hasPerm('sys:role:add')")
     @PreventRepeatSubmit
-    public Result addRole(@Valid @RequestBody RoleForm roleForm) {
+    public Result<?> addRole(@Valid @RequestBody RoleForm roleForm) {
         boolean result = roleService.saveRole(roleForm);
         return Result.judge(result);
     }
@@ -75,7 +75,7 @@ public class SysRoleController {
     @Operation(summary = "修改角色")
     @PutMapping(value = "/{id}")
     @PreAuthorize("@ss.hasPerm('sys:role:edit')")
-    public Result updateRole(@Valid @RequestBody RoleForm roleForm) {
+    public Result<?> updateRole(@Valid @RequestBody RoleForm roleForm) {
         boolean result = roleService.saveRole(roleForm);
         return Result.judge(result);
     }
@@ -83,7 +83,7 @@ public class SysRoleController {
     @Operation(summary = "删除角色")
     @DeleteMapping("/{ids}")
     @PreAuthorize("@ss.hasPerm('sys:role:delete')")
-    public Result deleteRoles(
+    public Result<?> deleteRoles(
             @Parameter(description = "删除角色，多个以英文逗号(,)拼接") @PathVariable String ids
     ) {
         boolean result = roleService.deleteRoles(ids);
@@ -92,7 +92,7 @@ public class SysRoleController {
 
     @Operation(summary = "修改角色状态")
     @PutMapping(value = "/{roleId}/status")
-    public Result updateRoleStatus(
+    public Result<?> updateRoleStatus(
             @Parameter(description = "角色ID") @PathVariable Long roleId,
             @Parameter(description = "状态(1:启用;0:禁用)") @RequestParam Integer status
     ) {
@@ -111,7 +111,7 @@ public class SysRoleController {
 
     @Operation(summary = "分配菜单(包括按钮权限)给角色")
     @PutMapping("/{roleId}/menus")
-    public Result assignMenusToRole(
+    public Result<?> assignMenusToRole(
             @PathVariable Long roleId,
             @RequestBody List<Long> menuIds
     ) {
diff --git a/src/main/java/com/youlai/system/controller/SysUserController.java b/src/main/java/com/youlai/system/controller/SysUserController.java
index d2b1cd27..c83f5743 100644
--- a/src/main/java/com/youlai/system/controller/SysUserController.java
+++ b/src/main/java/com/youlai/system/controller/SysUserController.java
@@ -67,7 +67,7 @@ public class SysUserController {
     @PostMapping
     @PreAuthorize("@ss.hasPerm('sys:user:add')")
     @PreventRepeatSubmit
-    public Result saveUser(
+    public Result<?> saveUser(
             @RequestBody @Valid UserForm userForm
     ) {
         boolean result = userService.saveUser(userForm);
@@ -86,7 +86,7 @@ public class SysUserController {
     @Operation(summary = "修改用户")
     @PutMapping(value = "/{userId}")
     @PreAuthorize("@ss.hasPerm('sys:user:edit')")
-    public Result updateUser(
+    public Result<?> updateUser(
             @Parameter(description = "用户ID") @PathVariable Long userId,
             @RequestBody @Validated UserForm userForm) {
         boolean result = userService.updateUser(userId, userForm);
@@ -96,7 +96,7 @@ public class SysUserController {
     @Operation(summary = "删除用户")
     @DeleteMapping("/{ids}")
     @PreAuthorize("@ss.hasPerm('sys:user:delete')")
-    public Result deleteUsers(
+    public Result<?> deleteUsers(
             @Parameter(description = "用户ID，多个以英文逗号(,)分割") @PathVariable String ids
     ) {
         boolean result = userService.deleteUsers(ids);
@@ -106,7 +106,7 @@ public class SysUserController {
     @Operation(summary = "修改用户密码")
     @PatchMapping(value = "/{userId}/password")
     @PreAuthorize("@ss.hasPerm('sys:user:password:reset')")
-    public Result updatePassword(
+    public Result<?> updatePassword(
             @Parameter(description = "用户ID") @PathVariable Long userId,
             @RequestParam String password
     ) {
@@ -116,7 +116,7 @@ public class SysUserController {
 
     @Operation(summary = "修改用户状态")
     @PatchMapping(value = "/{userId}/status")
-    public Result updateUserStatus(
+    public Result<?> updateUserStatus(
             @Parameter(description = "用户ID") @PathVariable Long userId,
             @Parameter(description = "用户状态(1:启用;0:禁用)") @RequestParam Integer status
     ) {
@@ -152,7 +152,7 @@ public class SysUserController {
 
     @Operation(summary = "导入用户")
     @PostMapping("/import")
-    public Result importUsers(MultipartFile file) throws IOException {
+    public Result<?> importUsers(MultipartFile file) throws IOException {
         UserImportListener listener = new UserImportListener();
         String msg = ExcelUtils.importExcel(file.getInputStream(), UserImportDTO.class, listener);
         return Result.success(msg);
diff --git a/src/main/java/com/youlai/system/converter/DictItemConverter.java b/src/main/java/com/youlai/system/converter/DictItemConverter.java
index caeb0c05..7c00e9c5 100644
--- a/src/main/java/com/youlai/system/converter/DictItemConverter.java
+++ b/src/main/java/com/youlai/system/converter/DictItemConverter.java
@@ -35,6 +35,6 @@ public interface DictItemConverter {
             @Mapping(target = "value", source = "id"),
             @Mapping(target = "label", source = "name")
     })
-    Option convertToOption(SysDictItem dictItem);
-    List<Option> convertToOption(List<SysDictItem> dictItems);
+    Option<Long> convertToOption(SysDictItem dictItem);
+    List<Option<Long>> convertToOption(List<SysDictItem> dictItems);
 }
diff --git a/src/main/java/com/youlai/system/converter/GenConfigConverter.java b/src/main/java/com/youlai/system/converter/GenConfigConverter.java
index 0ab99507..72454b14 100644
--- a/src/main/java/com/youlai/system/converter/GenConfigConverter.java
+++ b/src/main/java/com/youlai/system/converter/GenConfigConverter.java
@@ -30,7 +30,6 @@ public interface GenConfigConverter {
 
     GenConfigForm.FieldConfig toGenFieldConfigForm(GenFieldConfig genFieldConfig);
 
-
     GenConfig toGenConfig(GenConfigForm formData);
 
     List<GenFieldConfig> toGenFieldConfig(List<GenConfigForm.FieldConfig> fieldConfigs);
diff --git a/src/main/java/com/youlai/system/converter/RoleConverter.java b/src/main/java/com/youlai/system/converter/RoleConverter.java
index 2ddd071f..ac546d63 100644
--- a/src/main/java/com/youlai/system/converter/RoleConverter.java
+++ b/src/main/java/com/youlai/system/converter/RoleConverter.java
@@ -26,10 +26,9 @@ public interface RoleConverter {
             @Mapping(target = "value", source = "id"),
             @Mapping(target = "label", source = "name")
     })
-    Option entity2Option(SysRole role);
+    Option<Long> entity2Option(SysRole role);
 
-
-    List<Option> entities2Options(List<SysRole> roles);
+    List<Option<Long>> entities2Options(List<SysRole> roles);
 
     SysRole toEntity(RoleForm roleForm);
 
diff --git a/src/main/java/com/youlai/system/converter/SysConfigConverter.java b/src/main/java/com/youlai/system/converter/SysConfigConverter.java
index 873a13ac..8fd2e5c5 100644
--- a/src/main/java/com/youlai/system/converter/SysConfigConverter.java
+++ b/src/main/java/com/youlai/system/converter/SysConfigConverter.java
@@ -14,6 +14,7 @@ import org.mapstruct.Mapper;
  */
 @Mapper(componentModel = "spring")
 public interface SysConfigConverter {
+
     Page<ConfigVO> convertToPageVo(Page<SysConfig> page);
 
     SysConfig toEntity(ConfigForm configForm);
diff --git a/src/main/java/com/youlai/system/service/SysDeptService.java b/src/main/java/com/youlai/system/service/SysDeptService.java
index 48725e69..1185b735 100644
--- a/src/main/java/com/youlai/system/service/SysDeptService.java
+++ b/src/main/java/com/youlai/system/service/SysDeptService.java
@@ -19,31 +19,31 @@ public interface SysDeptService extends IService<SysDept> {
     /**
      * 部门列表
      *
-     * @return
+     * @return 部门列表
      */
     List<DeptVO> getDeptList(DeptQuery queryParams);
 
     /**
      * 部门树形下拉选项
      *
-     * @return
+     * @return 部门树形下拉选项
      */
-    List<Option> listDeptOptions();
+    List<Option<Long>> listDeptOptions();
 
     /**
      * 新增部门
      *
-     * @param formData
-     * @return
+     * @param formData 部门表单
+     * @return 部门ID
      */
     Long saveDept(DeptForm formData);
 
     /**
      * 修改部门
      *
-     * @param deptId
-     * @param formData
-     * @return
+     * @param deptId  部门ID
+     * @param formData 部门表单
+     * @return 部门ID
      */
     Long updateDept(Long deptId, DeptForm formData);
 
@@ -51,15 +51,15 @@ public interface SysDeptService extends IService<SysDept> {
      * 删除部门
      *
      * @param ids 部门ID，多个以英文逗号,拼接字符串
-     * @return
+     * @return 是否成功
      */
     boolean deleteByIds(String ids);
 
     /**
      * 获取部门详情
      *
-     * @param deptId
-     * @return
+     * @param deptId 部门ID
+     * @return 部门详情
      */
     DeptForm getDeptForm(Long deptId);
 }
diff --git a/src/main/java/com/youlai/system/service/SysDictService.java b/src/main/java/com/youlai/system/service/SysDictService.java
index b02316e2..5f8b606d 100644
--- a/src/main/java/com/youlai/system/service/SysDictService.java
+++ b/src/main/java/com/youlai/system/service/SysDictService.java
@@ -69,7 +69,7 @@ public interface SysDictService extends IService<SysDict> {
      * @param code 字典编码
      * @return
      */
-    List<Option> listDictItemsByCode(String code);
+    List<Option<Long>> listDictItemsByCode(String code);
 
 
     /**
@@ -77,5 +77,5 @@ public interface SysDictService extends IService<SysDict> {
      *
      * @return
      */
-    List<Option> getDictList();
+    List<Option<String>> getDictList();
 }
diff --git a/src/main/java/com/youlai/system/service/SysRoleService.java b/src/main/java/com/youlai/system/service/SysRoleService.java
index a1186524..a03b0bcc 100644
--- a/src/main/java/com/youlai/system/service/SysRoleService.java
+++ b/src/main/java/com/youlai/system/service/SysRoleService.java
@@ -34,7 +34,7 @@ public interface SysRoleService extends IService<SysRole> {
      *
      * @return
      */
-    List<Option> listRoleOptions();
+    List<Option<Long>> listRoleOptions();
 
     /**
      *
diff --git a/src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java
index da02e870..ceb153db 100644
--- a/src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java
+++ b/src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java
@@ -5,6 +5,7 @@ import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.youlai.system.common.constant.SymbolConstant;
 import com.youlai.system.common.constant.SystemConstants;
 import com.youlai.system.enums.StatusEnum;
 import com.youlai.system.converter.DeptConverter;
@@ -98,7 +99,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
      * @return 部门下拉List集合
      */
     @Override
-    public List<Option> listDeptOptions() {
+    public List<Option<Long>> listDeptOptions() {
 
         List<SysDept> deptList = this.list(new LambdaQueryWrapper<SysDept>()
                 .eq(SysDept::getStatus, StatusEnum.ENABLE.getValue())
@@ -208,12 +209,12 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
      * @param deptList 部门列表
      * @return 部门表格层级列表
      */
-    public static List<Option> recurDeptTreeOptions(long parentId, List<SysDept> deptList) {
+    public static List<Option<Long>> recurDeptTreeOptions(long parentId, List<SysDept> deptList) {
         return CollectionUtil.emptyIfNull(deptList).stream()
                 .filter(dept -> dept.getParentId().equals(parentId))
                 .map(dept -> {
-                    Option option = new Option(dept.getId(), dept.getName());
-                    List<Option> children = recurDeptTreeOptions(dept.getId(), deptList);
+                    Option<Long> option = new Option<>(dept.getId(), dept.getName());
+                    List<Option<Long>> children = recurDeptTreeOptions(dept.getId(), deptList);
                     if (CollectionUtil.isNotEmpty(children)) {
                         option.setChildren(children);
                     }
@@ -233,7 +234,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
     public boolean deleteByIds(String ids) {
         // 删除部门及子部门
         if (StrUtil.isNotBlank(ids)) {
-            String[] menuIds = ids.split(",");
+            String[] menuIds = ids.split(SymbolConstant.COMMA);
             for (String deptId : menuIds) {
                 this.remove(new LambdaQueryWrapper<SysDept>()
                         .eq(SysDept::getId, deptId)
@@ -258,7 +259,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
         } else {
             SysDept parent = this.getById(parentId);
             if (parent != null) {
-                treePath = parent.getTreePath() + "," + parent.getId();
+                treePath = parent.getTreePath() + SymbolConstant.COMMA + parent.getId();
             }
         }
         return treePath;
diff --git a/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java
index d2dee48c..880e714c 100644
--- a/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java
+++ b/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java
@@ -200,7 +200,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
      * @param code 字典编码
      */
     @Override
-    public List<Option> listDictItemsByCode(String code) {
+    public List<Option<Long>> listDictItemsByCode(String code) {
         // 根据字典编码获取字典ID
         SysDict dict = this.getOne(new LambdaQueryWrapper<SysDict>()
                 .eq(SysDict::getCode, code)
@@ -226,12 +226,12 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
      * 获取字典列表
      */
     @Override
-    public List<Option> getDictList() {
+    public List<Option<String>> getDictList() {
         return this.list(new LambdaQueryWrapper<SysDict>()
                         .eq(SysDict::getStatus, 1)
                         .select(SysDict::getName, SysDict::getCode)
                 ).stream()
-                .map(dict -> new Option(dict.getCode(), dict.getName()))
+                .map(dict -> new Option<>(dict.getCode(), dict.getName()))
                 .toList();
     }
 }
diff --git a/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java
index 1666e86c..8e784a81 100644
--- a/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java
+++ b/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java
@@ -256,10 +256,10 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
             entity.setParams(null);
         }
         if(menuType != MenuTypeEnum.BUTTON){
-            Assert.isTrue(this.count(new LambdaQueryWrapper<SysMenu>()
+            Assert.isFalse(this.exists(new LambdaQueryWrapper<SysMenu>()
                     .eq(SysMenu::getRouteName, entity.getRouteName())
                     .ne(menuForm.getId() != null, SysMenu::getId, menuForm.getId())
-            ) == 0, "路由名称已存在");
+            ), "路由名称已存在");
         }
 
         boolean result = this.saveOrUpdate(entity);
diff --git a/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java
index b71215b0..cffa9478 100644
--- a/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java
+++ b/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java
@@ -79,7 +79,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
      * @return {@link List<Option>} – 角色下拉列表
      */
     @Override
-    public List<Option> listRoleOptions() {
+    public List<Option<Long>> listRoleOptions() {
         // 查询数据
         List<SysRole> roleList = this.list(new LambdaQueryWrapper<SysRole>()
                 .ne(!SecurityUtils.isRoot(), SysRole::getCode, SystemConstants.ROOT_ROLE_CODE)