diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopStaffController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopStaffController.java index 99fe79d5..4ea45ae0 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopStaffController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopStaffController.java @@ -60,7 +60,7 @@ public class ShopStaffController { @SaAdminCheckPermission("shopStaff:detail") @GetMapping("/detail") public CzgResult detail(@RequestParam Long id) { - return CzgResult.success(shopStaffService.queryChain().eq(ShopStaff::getId, id).eq(ShopStaff::getShopId, StpKit.USER.getShopId()).one()); + return CzgResult.success(shopStaffService.detail(StpKit.USER.getShopId(), id)); } /** diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopStaff.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopStaff.java index 9921746a..31cc23db 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopStaff.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopStaff.java @@ -87,4 +87,7 @@ public class ShopStaff implements Serializable { */ private Integer isPc; + @Column(ignore = true) + private String roleName; + } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopStaffService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopStaffService.java index a6d066b0..82fbfc96 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopStaffService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopStaffService.java @@ -26,4 +26,6 @@ public interface ShopStaffService extends IService { Boolean delete(ShopStaffRemoveDTO shopStaffRemoveDTO); List permission(Long id); + + ShopStaff detail(Long shopId, Long id); } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopStaffServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopStaffServiceImpl.java index 12fcc0a7..4e82a598 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopStaffServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopStaffServiceImpl.java @@ -5,10 +5,7 @@ import cn.hutool.core.util.StrUtil; import com.czg.account.dto.staff.ShopStaffAddDTO; import com.czg.account.dto.staff.ShopStaffEditDTO; import com.czg.account.dto.staff.ShopStaffRemoveDTO; -import com.czg.account.entity.ShopPermission; -import com.czg.account.entity.ShopStaff; -import com.czg.account.entity.ShopStaffPermission; -import com.czg.account.entity.SysUser; +import com.czg.account.entity.*; import com.czg.account.service.*; import com.czg.exception.ApiNotPrintException; import com.czg.sa.StpKit; @@ -37,6 +34,8 @@ public class ShopStaffServiceImpl extends ServiceImpl permission(Long id) { return shopStaffPermissionService.getPermissionByStaffId(StpKit.USER.getShopId(), id, id).stream().map(ShopPermission::getId).toList(); } + + @Override + public ShopStaff detail(Long shopId, Long id) { + ShopStaff shopStaff = queryChain().eq(ShopStaff::getId, id).eq(ShopStaff::getShopId, shopId).one(); + if (shopStaff == null) { + throw new ApiNotPrintException("员工不存在"); + } + + SysUsersRoles sysUsersRoles = sysUsersRolesService.getOne(new QueryWrapper().eq(SysUsersRoles::getUserId, shopStaff.getId())); + SysRole role = sysRoleService.getById(sysUsersRoles.getRoleId()); + shopStaff.setRoleName(role.getName()); + return shopStaff; + } }