From 8b0bb47aac891151c2d90b05dc08c3b73119e5ae Mon Sep 17 00:00:00 2001 From: gong <1157756119@qq.com> Date: Mon, 15 Dec 2025 18:12:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../czg/service/account/service/impl/SysRoleServiceImpl.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java index d7df67ed2..8ddf22f6d 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java @@ -105,9 +105,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl @Override public Page getList(Long shopId, PageDTO pageDTO, String key, String startTime, String endTime) { QueryWrapper queryWrapper = new QueryWrapper(); -// if (!StpKit.USER.isAdmin()) { - queryWrapper.eq(SysRole::getCreateUserId, StpKit.USER.getLoginIdAsLong()); -// } + queryWrapper.eq(SysRole::getShopId, shopId); if (StrUtil.isNotBlank(key)) { queryWrapper.and(column(SysRole::getName).like(key).or(column(SysRole::getDescription).like(key))); From ff9b8729c95d9bacc2cd16862b3a4f33b19a3527 Mon Sep 17 00:00:00 2001 From: gong <1157756119@qq.com> Date: Mon, 15 Dec 2025 18:18:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SysRoleServiceImpl.java | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java index 8ddf22f6d..314e5f70a 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java @@ -105,7 +105,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl @Override public Page getList(Long shopId, PageDTO pageDTO, String key, String startTime, String endTime) { QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq(SysRole::getShopId, shopId); + queryWrapper.eq(SysRole::getCreateUserId, StpKit.USER.getLoginIdAsLong()); if (StrUtil.isNotBlank(key)) { queryWrapper.and(column(SysRole::getName).like(key).or(column(SysRole::getDescription).like(key))); @@ -295,20 +295,4 @@ public class SysRoleServiceImpl extends ServiceImpl impl } throw new CzgException("保存失败"); } - - public static void main(String[] args) { - SysRolesMenus menus = new SysRolesMenus(); - menus.setRoleId(1L); - menus.setMenuId(1L); - menus.setType(1); - SysRolesMenus menus2 = new SysRolesMenus(); - menus.setRoleId(1L); - menus.setMenuId(1L); - menus.setType(1); - Set rolesMenus = new HashSet<>(); - rolesMenus.add(menus); - rolesMenus.add(menus2); - System.out.println(rolesMenus); - - } } From d9e8c967927718a2a220c17ffcf5750b11d05a6d Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 18 Dec 2025 10:52:31 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9D=83=E9=99=90=20shopId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../czg/service/account/service/impl/SysRoleServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java index 314e5f70a..f21d3914c 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java @@ -105,7 +105,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl @Override public Page getList(Long shopId, PageDTO pageDTO, String key, String startTime, String endTime) { QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq(SysRole::getCreateUserId, StpKit.USER.getLoginIdAsLong()); + queryWrapper.eq(SysRole::getShopId, shopId); if (StrUtil.isNotBlank(key)) { queryWrapper.and(column(SysRole::getName).like(key).or(column(SysRole::getDescription).like(key))); From 2a7da699523385a959226e9af9db51b97eb3cf06 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 18 Dec 2025 13:50:40 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=A7=92=E8=89=B2=20=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../czg/controller/admin/RoleController.java | 14 +++++------ .../controller/admin/ShopInfoController.java | 8 +++--- .../src/main/java/com/czg/TimeQueryParam.java | 2 ++ .../czg/account/service/SysRoleService.java | 4 +-- .../czg/market/dto/MkDistributionUserDTO.java | 15 ++++++----- .../market/dto/MkPointsGoodsRecordDTO.java | 12 ++++----- .../dto/MkPointsGoodsRecordQueryDTO.java | 2 ++ .../com/czg/market/dto/SmsMoneyDetailDto.java | 2 ++ .../czg/market/dto/SmsTemplateQueryDTO.java | 2 ++ .../czg/market/entity/SysRoleTemplate.java | 14 ++++------- .../com/czg/market/vo/SmsShopMoneyVO.java | 2 ++ .../czg/order/entity/ShopOrderStatistic.java | 1 - .../service/impl/SysRoleServiceImpl.java | 25 +++++++++++-------- 13 files changed, 55 insertions(+), 48 deletions(-) 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 0fd468f71..0d638b032 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 @@ -34,7 +34,7 @@ public class RoleController { * @param pageDTO 分页信息 * @return 分页数据 */ - @SaAdminCheckPermission(parentName = "角色管理", value = "role:list", name = "角色列表") + @SaAdminCheckPermission(parentName = "角色管理接口", value = "role:list", name = "角色列表") @GetMapping("/list") public CzgResult> getList(PageDTO pageDTO, String key, String startTime, String endTime) { return CzgResult.success(roleService.getList(StpKit.USER.getShopId(), pageDTO, key, startTime, endTime)); @@ -48,10 +48,10 @@ public class RoleController { * @param type 0管理端 1收银机 * @return 分页数据 */ - @SaAdminCheckPermission(parentName = "角色管理", value = "role:menu", name = "角色菜单") + @SaAdminCheckPermission(parentName = "角色管理接口", value = "role:menu", name = "角色菜单") @GetMapping("/menu") public CzgResult> getRoleMenu(@RequestParam Integer id, @RequestParam Integer type) { - return CzgResult.success(roleService.getRoleMenu(StpKit.USER.getLoginIdAsLong(), id, type)); + return CzgResult.success(roleService.getRoleMenu(StpKit.USER.getShopId(), id, type)); } /** @@ -61,7 +61,7 @@ public class RoleController { * @param roleAddDTO 角色信息 * @return 是否成功 */ - @SaAdminCheckPermission(parentName = "角色管理", value = "role:add", name = "角色添加") + @SaAdminCheckPermission(parentName = "角色管理接口", value = "role:add", name = "角色添加") @PostMapping public CzgResult add(@RequestBody @Validated RoleAddDTO roleAddDTO) { return CzgResult.success(roleService.add(roleAddDTO)); @@ -75,7 +75,7 @@ public class RoleController { */ @PutMapping("/permission") public CzgResult editPermission(@RequestBody @Validated RolePermissionDTO rolePermissionDTO) { - return CzgResult.success(roleService.editPermission(StpKit.USER.getLoginIdAsLong(), rolePermissionDTO)); + return CzgResult.success(roleService.editPermission(StpKit.USER.getShopId(), rolePermissionDTO)); } /** @@ -85,7 +85,7 @@ public class RoleController { * @param roleEditDTO 角色信息 * @return 是否成功 */ - @SaAdminCheckPermission(parentName = "角色管理", value = "role:edit", name = "角色编辑") + @SaAdminCheckPermission(parentName = "角色管理接口", value = "role:edit", name = "角色编辑") @PutMapping public CzgResult edit(@RequestBody @Validated RoleEditDTO roleEditDTO) { return CzgResult.success(roleService.edit(roleEditDTO)); @@ -98,7 +98,7 @@ public class RoleController { * @param roleRemoveDTO 角色信息 * @return 是否成功 */ - @SaAdminCheckPermission(parentName = "角色管理", value = "role:remove", name = "角色删除") + @SaAdminCheckPermission(parentName = "角色管理接口", value = "role:remove", name = "角色删除") @DeleteMapping public CzgResult remove(@RequestBody @Validated RoleRemoveDTO roleRemoveDTO) { if (roleRemoveDTO.id() == 1L || roleRemoveDTO.id() == 2L) { diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopInfoController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopInfoController.java index e9c7ae612..3d9535f5d 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopInfoController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopInfoController.java @@ -38,7 +38,7 @@ public class ShopInfoController { * 权限标识: shopInfo:list */ @SaAdminCheckRole("管理员") - @SaAdminCheckPermission(parentName = "店铺管理", value = "shopInfo:list", name = "店铺列表") + @SaAdminCheckPermission(parentName = "店铺管理接口", value = "shopInfo:list", name = "店铺列表") @GetMapping public CzgResult> get(PageDTO pageDTO, String shopName, Integer status, Integer isHeadShop) { return CzgResult.success(shopInfoService.get(pageDTO, shopName, status, isHeadShop)); @@ -71,7 +71,7 @@ public class ShopInfoController { * 权限标识: shopInfo:add */ @SaAdminCheckRole("管理员") - @SaAdminCheckPermission(parentName = "店铺管理", value = "shopInfo:add", name = "店铺添加") + @SaAdminCheckPermission(parentName = "店铺管理接口", value = "shopInfo:add", name = "店铺添加") @PostMapping public CzgResult add(@RequestBody @Validated ShopInfoAddDTO shopInfoAddDTO) { return CzgResult.success(shopInfoService.add(shopInfoAddDTO)); @@ -81,7 +81,7 @@ public class ShopInfoController { * 店铺编辑 * 权限标识: shopInfo:edit */ - @SaAdminCheckPermission(parentName = "店铺管理", value = "shopInfo:edit", name = "店铺编辑") + @SaAdminCheckPermission(parentName = "店铺管理接口", value = "shopInfo:edit", name = "店铺编辑") @PutMapping public CzgResult edit(@RequestBody @Validated ShopInfoEditDTO shopInfoEditDTO) { return CzgResult.success(shopInfoService.edit(shopInfoEditDTO)); @@ -92,7 +92,7 @@ public class ShopInfoController { * 权限标识: shopInfo:del */ @SaAdminCheckRole("管理员") - @SaAdminCheckPermission(parentName = "店铺管理", value = "shopInfo:del", name = "店铺删除") + @SaAdminCheckPermission(parentName = "店铺管理接口", value = "shopInfo:del", name = "店铺删除") @DeleteMapping public CzgResult delete(@RequestParam Integer id) { return CzgResult.success(shopInfoService.remove(new QueryWrapper().eq(ShopInfo::getId, id))); diff --git a/cash-common/cash-common-service/src/main/java/com/czg/TimeQueryParam.java b/cash-common/cash-common-service/src/main/java/com/czg/TimeQueryParam.java index 3fb2a05f7..9f0fd68ad 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/TimeQueryParam.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/TimeQueryParam.java @@ -2,11 +2,13 @@ package com.czg; import com.czg.utils.CzgStrUtils; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author ww * @description */ +@EqualsAndHashCode(callSuper = true) @Data public class TimeQueryParam extends BaseQueryParam { /** diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/SysRoleService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/SysRoleService.java index 15e94ea69..8e38e02b0 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/SysRoleService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/SysRoleService.java @@ -27,9 +27,9 @@ public interface SysRoleService extends IService { Boolean edit(RoleEditDTO roleEditDTO); - List getRoleMenu(long loginIdAsLong, Integer id, Integer type); + List getRoleMenu(long shopId, Integer id, Integer type); - Boolean editPermission(long userId, RolePermissionDTO rolePermissionDTO); + Boolean editPermission(long shopId, RolePermissionDTO rolePermissionDTO); Boolean saveByTemplate(long shopId, RoleSaveTemplateDTO dto); diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDistributionUserDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDistributionUserDTO.java index 8c8efe714..1e94e896f 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDistributionUserDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDistributionUserDTO.java @@ -1,26 +1,25 @@ package com.czg.market.dto; -import java.io.Serializable; -import java.math.BigDecimal; -import java.sql.Timestamp; - import com.czg.TimeQueryParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.experimental.Accessors; import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; import java.time.LocalDateTime; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - /** * 分销员表 实体类。 * * @author ww * @since 2025-10-27 */ +@EqualsAndHashCode(callSuper = true) @Data @NoArgsConstructor @AllArgsConstructor diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkPointsGoodsRecordDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkPointsGoodsRecordDTO.java index 0335c99d2..706483e59 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkPointsGoodsRecordDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkPointsGoodsRecordDTO.java @@ -1,17 +1,14 @@ package com.czg.market.dto; -import java.io.Serializable; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import com.alibaba.fastjson2.annotation.JSONField; -import com.czg.BaseQueryParam; import com.czg.market.entity.MkPointsGoodsRecord; -import lombok.experimental.Accessors; -import java.io.Serial; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +import java.io.Serializable; /** * 积分兑换记录 实体类。 @@ -19,6 +16,7 @@ import lombok.NoArgsConstructor; * @author ww * @since 2025-12-08 */ +@EqualsAndHashCode(callSuper = true) @Data @NoArgsConstructor @AllArgsConstructor diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkPointsGoodsRecordQueryDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkPointsGoodsRecordQueryDTO.java index 052a590c5..5b68211ea 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkPointsGoodsRecordQueryDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkPointsGoodsRecordQueryDTO.java @@ -4,6 +4,7 @@ package com.czg.market.dto; import com.czg.TimeQueryParam; import com.czg.utils.CzgStrUtils; import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serial; import java.io.Serializable; @@ -14,6 +15,7 @@ import java.io.Serializable; * @author ww * @since 2025-12-08 */ +@EqualsAndHashCode(callSuper = true) @Data public class MkPointsGoodsRecordQueryDTO extends TimeQueryParam implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsMoneyDetailDto.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsMoneyDetailDto.java index fa61db0cc..c89310ddd 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsMoneyDetailDto.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsMoneyDetailDto.java @@ -2,6 +2,7 @@ package com.czg.market.dto; import com.czg.TimeQueryParam; import lombok.Data; +import lombok.EqualsAndHashCode; /** * 平台查看 商家短信余额明细 @@ -9,6 +10,7 @@ import lombok.Data; * @author ww * @description */ +@EqualsAndHashCode(callSuper = true) @Data public class SmsMoneyDetailDto extends TimeQueryParam { // 1 充值 2 扣款 diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsTemplateQueryDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsTemplateQueryDTO.java index dd28d740a..09be716f0 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsTemplateQueryDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsTemplateQueryDTO.java @@ -2,12 +2,14 @@ package com.czg.market.dto; import com.czg.TimeQueryParam; import lombok.Data; +import lombok.EqualsAndHashCode; /** * 平台 商家申请记录查询参数 * @author ww * @description 平台 商家申请记录查询参数 */ +@EqualsAndHashCode(callSuper = true) @Data public class SmsTemplateQueryDTO extends TimeQueryParam { private Integer status; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SysRoleTemplate.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SysRoleTemplate.java index 28451071b..312b984a5 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SysRoleTemplate.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SysRoleTemplate.java @@ -4,17 +4,14 @@ import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; -import java.io.Serializable; -import java.time.LocalDateTime; - -import java.io.Serial; -import java.util.ArrayList; -import java.util.List; - import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serial; +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; /** * 角色模板 实体类。 @@ -23,7 +20,6 @@ import lombok.NoArgsConstructor; * @since 2025-12-08 */ @Data -@Builder @NoArgsConstructor @AllArgsConstructor @Table("sys_role_template") diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/SmsShopMoneyVO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/SmsShopMoneyVO.java index abf0db67a..723a13b8d 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/SmsShopMoneyVO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/SmsShopMoneyVO.java @@ -2,11 +2,13 @@ package com.czg.market.vo; import com.czg.market.entity.SmsShopMoney; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author ww * @description */ +@EqualsAndHashCode(callSuper = true) @Data public class SmsShopMoneyVO extends SmsShopMoney { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java index c5a5f9798..98eb637f2 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java @@ -22,7 +22,6 @@ import java.time.LocalDateTime; * @since 2025-11-20 */ @Data -@Builder @NoArgsConstructor @AllArgsConstructor @Table("tb_shop_order_statistic") diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java index f21d3914c..5ce6cbd0e 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java @@ -125,8 +125,8 @@ public class SysRoleServiceImpl extends ServiceImpl impl } @Override - public List getRoleMenu(long userId, Integer id, Integer type) { - SysRole role = queryChain().eq(SysRole::getId, id).eq(SysRole::getCreateUserId, userId).one(); + public List getRoleMenu(long shopId, Integer id, Integer type) { + SysRole role = queryChain().eq(SysRole::getId, id).eq(SysRole::getCreateUserId, shopId).one(); if (role == null) { throw new CzgException("角色不存在"); } @@ -195,8 +195,8 @@ public class SysRoleServiceImpl extends ServiceImpl impl @Override @Transactional(rollbackFor = Exception.class) - public Boolean editPermission(long userId, RolePermissionDTO rolePermissionDTO) { - long count = count(new QueryWrapper().eq(SysRole::getId, rolePermissionDTO.getRoleId()).eq(SysRole::getCreateUserId, userId)); + public Boolean editPermission(long shopId, RolePermissionDTO rolePermissionDTO) { + long count = count(new QueryWrapper().eq(SysRole::getId, rolePermissionDTO.getRoleId()).eq(SysRole::getCreateUserId, shopId)); if (count == 0) { throw new CzgException("角色不存在"); } @@ -226,8 +226,8 @@ public class SysRoleServiceImpl extends ServiceImpl impl sysRole.setName(roleAddDTO.name()); sysRole.setLevel(roleAddDTO.level()); sysRole.setDescription(roleAddDTO.description()); - sysRole.setShopId(StpKit.USER.getLoginIdAsLong()); - sysRole.setCreateUserId(StpKit.USER.getLoginIdAsLong()); + sysRole.setShopId(StpKit.USER.getShopId()); + sysRole.setCreateUserId(StpKit.USER.getShopId()); sysRole.setCreateTime(DateUtil.date().toLocalDateTime()); boolean save = save(sysRole); if (save) { @@ -267,13 +267,18 @@ public class SysRoleServiceImpl extends ServiceImpl impl @Override @Transactional(rollbackFor = Exception.class) public Boolean edit(RoleEditDTO roleEditDTO) { - SysRole role = queryChain().eq(SysRole::getId, roleEditDTO.getId()).eq(SysRole::getCreateUserId, StpKit.USER.getLoginIdAsLong()).one(); + SysRole role = queryChain().eq(SysRole::getId, roleEditDTO.getId()).eq(SysRole::getCreateUserId, StpKit.USER.getShopId()).one(); if (role == null) { throw new CzgException("角色不存在"); } - - long roleCount = queryChain().eq(SysRole::getName, roleEditDTO.getName()).ne(SysRole::getId, roleEditDTO.getId()) - .eq(SysRole::getShopId, StpKit.USER.getShopId()).count(); + long roleCount; + if (role.getShopId() == null) { + roleCount = queryChain().eq(SysRole::getName, roleEditDTO.getName()).ne(SysRole::getId, roleEditDTO.getId()) + .isNull(SysRole::getShopId).count(); + } else { + roleCount = queryChain().eq(SysRole::getName, roleEditDTO.getName()).ne(SysRole::getId, roleEditDTO.getId()) + .eq(SysRole::getShopId, StpKit.USER.getShopId()).count(); + } if (roleCount > 0) { throw new CzgException("此角色名称已存在"); }