From 7d42d545ce1c5a7acb01d7571ce4f3a6fe0162e1 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 03 Sep 2024 15:25:46 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/vo/position/AdminPositionVO.java | 7 ++++++-
src/main/java/com/nq/service/impl/UserPositionServiceImpl.java | 8 ++++++--
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index ece4db7..a5fbb8a 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -687,9 +687,9 @@
List<Integer> ids = new ArrayList<>();
- if(null != agentId){
+ if(null != searchId){
ids = getSubordinates(searchId);
- ids.add(agentId);
+ ids.add(searchId);
}
List<UserPosition> userPositions = this.userPositionMapper.listByAgent(positionType, state,
@@ -772,6 +772,10 @@
List<AdminPositionVO> adminPositionVOS = Lists.newArrayList();
for (UserPosition position : userPositions) {
AdminPositionVO adminPositionVO = assembleAdminPositionVO(position);
+ AgentUser agentUser = agentUserMapper.selectById(adminPositionVO.getAgentId());
+ adminPositionVO.setAgentName(agentUser.getAgentName());
+ User user = userMapper.selectById(adminPositionVO.getUserId());
+ adminPositionVO.setPhone(user.getPhone());
adminPositionVOS.add(adminPositionVO);
}
PageInfo pageInfo = new PageInfo(userPositions);
diff --git a/src/main/java/com/nq/vo/position/AdminPositionVO.java b/src/main/java/com/nq/vo/position/AdminPositionVO.java
index f03dd03..2595b7d 100644
--- a/src/main/java/com/nq/vo/position/AdminPositionVO.java
+++ b/src/main/java/com/nq/vo/position/AdminPositionVO.java
@@ -1,8 +1,10 @@
package com.nq.vo.position;
+import lombok.Data;
+
import java.math.BigDecimal;
import java.util.Date;
-
+@Data
public class AdminPositionVO {
private Integer id;
private Integer positionType;
@@ -53,6 +55,9 @@
private String lockMsg;
private String stockPlate;
+ private String agentName;
+ private String phone;
+
public void setPositionType(Integer positionType) {
this.positionType = positionType;
}
--
Gitblit v1.9.3