1

src/main/java/com/fdkankan/manage/entity/AgentNew.java

@@ -53,7 +53,10 @@ public class AgentNew implements Serializable {
      * 创建人id
      */
     @TableField("sys_user_id")
-    private Integer sysUserId;
+    private Long sysUserId;
+
+    @TableField("create_agent_id")
+    private Integer createAgentId;
 
     @TableField("rec_status")
     @TableLogic(value = "A",delval = "I")

src/main/java/com/fdkankan/manage/service/ISysUserService.java

@@ -7,6 +7,7 @@ import com.fdkankan.manage.vo.request.SysUserParam;
 import com.fdkankan.manage.vo.response.ManageLoginResponse;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Set;
 
 /**

src/main/java/com/fdkankan/manage/service/impl/AgentNewServiceImpl.java

@@ -28,10 +28,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.WeakHashMap;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -63,14 +61,33 @@ public class AgentNewServiceImpl extends ServiceImpl<IAgentNewMapper, AgentNew>
         }
         wrapper.orderByDesc(AgentNew::getCreateTime);
         Page<AgentNew> page = this.page(new Page<>(agentParam.getPageNum(), agentParam.getPageSize()), wrapper);
+        Set<Long> sysUserIds = page.getRecords().stream().map(AgentNew::getSysUserId).collect(Collectors.toSet());
+        List<Integer> createIds = page.getRecords().stream().map(AgentNew::getCreateAgentId).collect(Collectors.toList());
+
+        HashMap<Long,SysUser> sysUserHashMap = sysUserService.getByIds(sysUserIds);
+        List<AgentNew> agentNews = this.listByIds(createIds);
+        HashMap<Integer,AgentNew> agentNewHashMap = new HashMap<>();
+        agentNews.forEach(e -> agentNewHashMap.put(e.getId(),e));
+
+
         List<AgentVo> voList = new ArrayList<>();
         for (AgentNew record : page.getRecords()) {
             AgentVo vo = new AgentVo();
             BeanUtils.copyProperties(record,vo);
-            SysUser sysUser = sysUserService.getById(vo.getSysUserId());
-            if(sysUser != null){
-                vo.setSysUserName(sysUser.getNickName());
+            if(vo.getSysUserId() != null){
+                SysUser sysUser = sysUserHashMap.get(vo.getSysUserId());
+                if(sysUser != null){
+                    vo.setSysUserName(sysUser.getNickName());
+                }
             }
+
+            if(vo.getCreateAgentId() != null){
+                AgentNew agentNew = agentNewHashMap.get(vo.getSysUserId());
+                if(agentNew != null){
+                    vo.setSysUserName(agentNew.getName());
+                }
+            }
+
             voList.add(vo);
         }
 

src/main/java/com/fdkankan/manage/service/impl/SysUserServiceImpl.java

@@ -145,4 +145,5 @@ public class SysUserServiceImpl extends ServiceImpl<ISysUserMapper, SysUser> imp
         }
         return map;
     }
+
 }