irving/peipei-backend
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix

Browse Source
This commit is contained in:
hucs
2024-06-20 11:55:59 +08:00
parent 56497f6a07
commit 66fdde9735
2 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysUserServiceImpl.java
View File

@@ -10,10 +10,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoEntity;
import com.starry.admin.modules.clerk.service.IPlayClerkUserInfoService;
import com.starry.admin.modules.personnel.module.entity.PlayPersonnelAdminInfoEntity;
import com.starry.admin.modules.personnel.module.entity.PlayPersonnelGroupInfoEntity;
import com.starry.admin.modules.personnel.module.entity.PlayPersonnelWaiterInfoEntity;
import com.starry.admin.modules.personnel.module.vo.PlayPersonnelUserInfoQueryVo;
import com.starry.admin.modules.personnel.module.vo.PlayPersonnelUserInfoReturnVo;
import com.starry.admin.modules.personnel.service.IPlayPersonnelAdminInfoService;
import com.starry.admin.modules.personnel.service.IPlayPersonnelGroupInfoService;
import com.starry.admin.modules.personnel.service.IPlayPersonnelWaiterInfoService;
import com.starry.admin.modules.system.entity.SysRoleEntity;
import com.starry.admin.modules.system.entity.SysUserEntity;
import com.starry.admin.modules.system.entity.SysUserRoleEntity;
@@ -35,7 +39,6 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -60,6 +63,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
private SysRoleMapper sysRoleMapper;
@Resource
private IPlayClerkUserInfoService clerkUserInfoService;
@Resource
private IPlayPersonnelAdminInfoService playPersonnelAdminInfoService;
@Resource
private IPlayPersonnelGroupInfoService playClerkGroupInfoService;
@Resource
private IPlayPersonnelWaiterInfoService playClerkWaiterInfoService;
@Override
@@ -288,15 +297,22 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
if (StringUtils.isNotEmpty(ca.getClerkId())) {
vo.setClerkUserInfo(clerkUserInfoService.selectById(ca.getClerkId()));
}
SysUserEntityListVo.RoleVo roleVo = new SysUserEntityListVo.RoleVo();
roleVo.setRoleName("客服");
roleVo.setRoleUserName("张三");
// 查询角色
List<SysUserEntityListVo.RoleVo> roleList = new ArrayList<>();
PlayPersonnelAdminInfoEntity adminInfoEntity = playPersonnelAdminInfoService.selectByUserId(ca.getUserId());
if (Objects.nonNull(adminInfoEntity)) {
roleList.add(new SysUserEntityListVo.RoleVo("管理员", adminInfoEntity.getAdminName()));
}
PlayPersonnelGroupInfoEntity groupInfoEntity = playClerkGroupInfoService.selectByUserId(ca.getUserId());
if (Objects.nonNull(groupInfoEntity)) {
roleList.add(new SysUserEntityListVo.RoleVo("组长", groupInfoEntity.getLeaderName()));
}
PlayPersonnelWaiterInfoEntity waiterInfoEntity = playClerkWaiterInfoService.selectByUserId(ca.getUserId());
if (Objects.nonNull(waiterInfoEntity)) {
roleList.add(new SysUserEntityListVo.RoleVo("客服", waiterInfoEntity.getWaiterName()));
}
SysUserEntityListVo.RoleVo roleVo2 = new SysUserEntityListVo.RoleVo();
roleVo2.setRoleName("管理员");
roleVo2.setRoleUserName("李四");
vo.setRoleVoList(Arrays.asList(roleVo, roleVo2));
vo.setRoleVoList(roleList);
return vo;
}).collect(Collectors.toList());
}

2
play-admin/src/main/java/com/starry/admin/modules/system/vo/SysUserEntityListVo.java
View File

@@ -2,6 +2,7 @@ package com.starry.admin.modules.system.vo;
import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoEntity;
import com.starry.admin.modules.system.entity.SysUserEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -21,6 +22,7 @@ public class SysUserEntityListVo extends SysUserEntity {
private PlayClerkUserInfoEntity clerkUserInfo;
@Data
@AllArgsConstructor
public static class RoleVo {
private String roleName;