diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/MenuController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/MenuController.java index f061e98a6..374f9c00f 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/MenuController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/MenuController.java @@ -40,7 +40,7 @@ public class MenuController { * @return 菜单结构 */ @SaAdminCheckRole("管理员") -// @SaAdminCheckPermission("menu:list") + @SaAdminCheckPermission(value = "menu:list", name = "菜单列表") @GetMapping("/list") public CzgResult> all(String title, String startTime, String endTime) { return CzgResult.success(menuService.getAll(title, startTime, endTime)); @@ -51,7 +51,7 @@ public class MenuController { * @return 菜单结构 */ @SaAdminCheckRole("管理员") -// @SaAdminCheckPermission("menu:detail") + @SaAdminCheckPermission(value = "menu:detail", name = "菜单详情") @GetMapping("/detail") public CzgResult detail(@RequestParam Integer id) { return CzgResult.success(menuService.getById(id)); @@ -62,7 +62,7 @@ public class MenuController { * @return 是否成功 */ @SaAdminCheckRole("管理员") -// @SaAdminCheckPermission("menu:add") + @SaAdminCheckPermission(value = "menu:add", name = "菜单添加") @PostMapping public CzgResult add(@RequestBody @Validated MenuAddDTO menuAddDTO) { return CzgResult.success(menuService.add(menuAddDTO)); @@ -73,7 +73,7 @@ public class MenuController { * @return 是否成功 */ @SaAdminCheckRole("管理员") -// @SaAdminCheckPermission("menu:edit") + @SaAdminCheckPermission(value = "menu:edit", name = "菜单编辑") @PutMapping() public CzgResult edit(@RequestBody @Validated MenuEditDTO menuEditDTO) { return CzgResult.success(menuService.edit(menuEditDTO)); @@ -84,7 +84,7 @@ public class MenuController { * @return 是否成功 */ @SaAdminCheckRole("管理员") -// @SaAdminCheckPermission("menu:del") + @SaAdminCheckPermission(value = "menu:del", name = "菜单删除") @DeleteMapping() public CzgResult edit(@RequestBody @Validated MenuDelDTO menuDelDTO) { return CzgResult.success(menuService.removeById(menuDelDTO.getId())); diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/RoleController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/RoleController.java index 686111333..78cbd90c7 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/RoleController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/RoleController.java @@ -85,6 +85,9 @@ public class RoleController { @SaAdminCheckPermission(value = "role:remove", name = "角色删除") @DeleteMapping public CzgResult remove(@RequestBody @Validated RoleRemoveDTO roleRemoveDTO) { + if (roleRemoveDTO.id() == 1L || roleRemoveDTO.id() == 2L) { + return CzgResult.failure("超级管理员角色不可删除"); + } return CzgResult.success(roleService.removeById(roleRemoveDTO.id())); } } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java index dc7491de1..b0464aa81 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java @@ -117,7 +117,7 @@ public class ShopInfoServiceImpl extends ServiceImpl i } // 添加系统账号 - shopInfoAddDTO.setRoleId(shopInfoAddDTO.getRoleId() == null ? 1L : shopInfoAddDTO.getRoleId()); + shopInfoAddDTO.setRoleId(shopInfoAddDTO.getRoleId() == null ? 2L : shopInfoAddDTO.getRoleId()); SysUser sysUser = sysUserService.addUser(shopInfoAddDTO.getShopName(), shopInfoAddDTO.getAccountName(), shopInfoAddDTO.getAccountPwd(), shopInfoAddDTO.getPhone(), shopInfoAddDTO.getRoleId()); // 保存店铺信息