From 30778daae1a3df398d9414cb295b085b39882324 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Sat, 20 Sep 2025 18:35:31 +0800 Subject: [PATCH] 111 --- .../service/impl/act/ActCancelItemServiceImpl.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/act/ActCancelItemServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/act/ActCancelItemServiceImpl.java index b518c89b6..2324cfe0f 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/act/ActCancelItemServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/act/ActCancelItemServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.bsd.pjcloud.admin.api.dto.UserInfo; import com.bsd.pjcloud.admin.api.feign.RemoteUserService; import com.bsd.pjcloud.admin.api.vo.UserVO; +import com.bsd.pjcloud.common.core.constant.CommonRoleConstant; import com.bsd.pjcloud.common.core.constant.enums.MerchantTypeEnum; import com.bsd.pjcloud.common.core.util.CollectionUtils; import com.bsd.pjcloud.common.data.resolver.ParamResolver; @@ -30,6 +31,7 @@ import org.springframework.stereotype.Service; import java.time.LocalDateTime; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Map; @@ -169,9 +171,16 @@ public class ActCancelItemServiceImpl extends ServiceImpl appMchPage(Page page, PjcloudUser user, ActCancelItemDto dto) { if (ObjectUtil.isEmpty(user.getDeptId())) return null; + // 查询用户 + UserInfo userInfo = remoteUserService.getByUserId(user.getId()).getData(); + if (ObjectUtil.isEmpty(userInfo)) return null; // 查询商户 - MchManageVo mchDetail = mchManageService.getByDeptId(user.getDeptId(), MerchantTypeEnum.SUPERMARKET); + MchManageVo mchDetail = mchManageService.getByDeptId(userInfo.getSysUser().getDeptId(), MerchantTypeEnum.SUPERMARKET); if (ObjectUtil.isEmpty(mchDetail)) return null; + // 判断是否有商户权限 + if (ObjectUtil.isEmpty(userInfo.getRoleCodes()) || !Arrays.asList(userInfo.getRoleCodes()).contains(CommonRoleConstant.MCH_USER)) { + return null; + } dto.setMchId(mchDetail.getId()); return pageList(page, dto); }