From a2b8fe53d2b9063cc261e705062c7a5d467c895b Mon Sep 17 00:00:00 2001 From: hucs Date: Tue, 25 Jun 2024 10:52:23 +0800 Subject: [PATCH] fix --- .../starry/admin/common/domain/LoginUser.java | 3 ++ .../impl/PlayClerkUserInfoServiceImpl.java | 11 +++++++ .../IPlayPersonnelGroupInfoService.java | 3 ++ .../PlayPersonnelGroupInfoServiceImpl.java | 32 +++++++++++++++++++ .../service/impl/SysUserRoleServiceImpl.java | 1 + 5 files changed, 50 insertions(+) diff --git a/play-admin/src/main/java/com/starry/admin/common/domain/LoginUser.java b/play-admin/src/main/java/com/starry/admin/common/domain/LoginUser.java index 2016e9d..c682103 100644 --- a/play-admin/src/main/java/com/starry/admin/common/domain/LoginUser.java +++ b/play-admin/src/main/java/com/starry/admin/common/domain/LoginUser.java @@ -84,6 +84,9 @@ public class LoginUser implements UserDetails { */ private Integer tenantStatus; + // 当前角色 + private String currentRole; + @Override public Collection getAuthorities() { return null; diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java index 9235bf8..17bc8fe 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.starry.admin.common.domain.LoginUser; import com.starry.admin.common.exception.CustomException; import com.starry.admin.modules.balance.service.IPlayBalanceDetailsInfoService; import com.starry.admin.modules.clerk.mapper.PlayClerkUserInfoMapper; @@ -19,10 +20,12 @@ import com.starry.admin.modules.follow.module.entity.PlayCustomFollowInfoEntity; import com.starry.admin.modules.follow.service.IPlayCustomFollowInfoService; import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity; import com.starry.admin.modules.order.service.IPlayOrderInfoService; +import com.starry.admin.modules.personnel.service.IPlayPersonnelGroupInfoService; import com.starry.admin.modules.statistics.module.vo.PlayClerkPerformanceInfoQueryVo; import com.starry.admin.modules.weichat.entity.PlayClerkUserLoginResponseVo; import com.starry.admin.modules.weichat.entity.clerk.PlayClerkUserInfoQueryVo; import com.starry.admin.modules.weichat.entity.clerk.PlayClerkUserInfoResultVo; +import com.starry.admin.utils.SecurityUtils; import com.starry.common.utils.ConvertUtil; import com.starry.common.utils.IdUtils; import org.springframework.stereotype.Service; @@ -61,6 +64,8 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl selectByPage(PlayClerkUserQueryVo vo) { MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper<>(); + + LoginUser loginUser = SecurityUtils.getLoginUser(); // 主表（店员表全部字段） lambdaQueryWrapper.selectAll(PlayClerkUserInfoEntity.class); + if (StrUtil.isNotBlank(vo.getId())) { lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getId, vo.getId()); } @@ -347,6 +355,9 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser()); + lambdaQueryWrapper.in(PlayClerkUserInfoEntity::getId, clerkIdList); IPage page = this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkUserReturnVo.class, lambdaQueryWrapper); for (PlayClerkUserReturnVo record : page.getRecords()) { diff --git a/play-admin/src/main/java/com/starry/admin/modules/personnel/service/IPlayPersonnelGroupInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/personnel/service/IPlayPersonnelGroupInfoService.java index c0c7f7c..ee57e1e 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/personnel/service/IPlayPersonnelGroupInfoService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/personnel/service/IPlayPersonnelGroupInfoService.java @@ -2,6 +2,7 @@ package com.starry.admin.modules.personnel.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import com.starry.admin.common.domain.LoginUser; import com.starry.admin.modules.personnel.module.entity.PlayPersonnelGroupInfoEntity; import com.starry.admin.modules.personnel.module.vo.PlayPersonnelGroupInfoQueryVo; import com.starry.admin.modules.personnel.module.vo.PlayPersonnelGroupInfoReturnVo; @@ -81,4 +82,6 @@ public interface IPlayPersonnelGroupInfoService extends IService getValidClerkIdList(LoginUser loginUser); } diff --git a/play-admin/src/main/java/com/starry/admin/modules/personnel/service/impl/PlayPersonnelGroupInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/personnel/service/impl/PlayPersonnelGroupInfoServiceImpl.java index 3105adf..2999f0e 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/personnel/service/impl/PlayPersonnelGroupInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/personnel/service/impl/PlayPersonnelGroupInfoServiceImpl.java @@ -1,11 +1,16 @@ package com.starry.admin.modules.personnel.service.impl; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.starry.admin.common.domain.LoginUser; +import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoEntity; +import com.starry.admin.modules.clerk.service.IPlayClerkUserInfoService; import com.starry.admin.modules.personnel.mapper.PlayPersonnelGroupInfoMapper; import com.starry.admin.modules.personnel.module.entity.PlayPersonnelGroupInfoEntity; import com.starry.admin.modules.personnel.module.vo.PlayPersonnelGroupInfoQueryVo; @@ -16,7 +21,10 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Arrays; +import java.util.Collections; import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; /** * 店员分组信息Service业务层处理 @@ -28,6 +36,8 @@ import java.util.List; public class PlayPersonnelGroupInfoServiceImpl extends ServiceImpl implements IPlayPersonnelGroupInfoService { @Resource private PlayPersonnelGroupInfoMapper playClerkGroupInfoMapper; + @Resource + private IPlayClerkUserInfoService clerkUserInfoService; /** * 查询店员分组信息 @@ -107,4 +117,26 @@ public class PlayPersonnelGroupInfoServiceImpl extends ServiceImpl getValidClerkIdList(LoginUser loginUser) { + List idList; + PlayPersonnelGroupInfoEntity groupInfoEntity = this.selectByUserId(loginUser.getUserId()); + if (Objects.nonNull(groupInfoEntity)) { + List list = clerkUserInfoService.list(Wrappers.lambdaQuery(PlayClerkUserInfoEntity.class).eq(PlayClerkUserInfoEntity::getGroupId, groupInfoEntity.getId()).select(PlayClerkUserInfoEntity::getId)); + idList = list.stream().map(PlayClerkUserInfoEntity::getId).collect(Collectors.toList()); + PlayClerkUserInfoEntity entity = clerkUserInfoService.getOne(Wrappers.lambdaQuery(PlayClerkUserInfoEntity.class).eq(PlayClerkUserInfoEntity::getSysUserId, loginUser.getUserId()), false); + if (Objects.nonNull(entity)) { + idList.add(entity.getId()); + } + } else { + // 返回所有的clerkId + idList = clerkUserInfoService.list(Wrappers.lambdaQuery(PlayClerkUserInfoEntity.class).select(PlayClerkUserInfoEntity::getId)).stream().map(PlayClerkUserInfoEntity::getId).collect(Collectors.toList()); + } + + if (CollectionUtil.isEmpty(idList)) { + idList = Collections.singletonList("-999"); + } + return idList; + } } diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysUserRoleServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysUserRoleServiceImpl.java index 278e497..8b7a28a 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysUserRoleServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysUserRoleServiceImpl.java @@ -30,6 +30,7 @@ public class SysUserRoleServiceImpl extends ServiceImpl