|
@@ -214,6 +214,9 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
|
|
|
public Tuple2<List<Long>, List<AgentDTO>> getUserAgent(String account, String pitcherId, Long agentId) {
|
|
|
//组成员列表
|
|
|
List<Long> memberUserIdList = sysUserGroupRpc.memberUserId(SecurityUtil.getCompanyId(), SecurityUtil.getUserId()).getData();
|
|
|
+
|
|
|
+ log.error("查询组员 userId : {}, list : {}", SecurityUtil.getUserId(), JsonUtil.toString(memberUserIdList));
|
|
|
+
|
|
|
//自然量查询
|
|
|
if (Objects.equals(agentId, Agent.DEFAULT_AGENT)) {
|
|
|
//判断管理员或者组长
|
|
@@ -292,7 +295,12 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
|
|
|
List<AgentChoiceVO> choiceVOList = super.list(new LambdaQueryWrapper<Agent>()
|
|
|
.eq(!SecurityUtil.isAdmin(), Agent::getCreateBy, SecurityUtil.getUserId())
|
|
|
).stream().map(agent -> BeanUtil.copy(agent, AgentChoiceVO.class)).collect(Collectors.toList());
|
|
|
- choiceVOList.add(AgentChoiceVO.builder().id(Agent.DEFAULT_AGENT).agentName(Agent.DEFAULT_AGENT_NAME).build());
|
|
|
+
|
|
|
+ //组成员列表
|
|
|
+ List<Long> memberUserIdList = sysUserGroupRpc.memberUserId(SecurityUtil.getCompanyId(), SecurityUtil.getUserId()).getData();
|
|
|
+ if (CollectionUtils.isNotEmpty(memberUserIdList)) {
|
|
|
+ choiceVOList.add(AgentChoiceVO.builder().id(Agent.DEFAULT_AGENT).agentName(Agent.DEFAULT_AGENT_NAME).build());
|
|
|
+ }
|
|
|
return choiceVOList;
|
|
|
}
|
|
|
|