lyhzzz 4 mesi fa
parent
commit
001df5ac41

+ 3 - 0
src/main/java/com/fdkankan/agent/entity/AgentAuthorizeModeling.java

@@ -93,6 +93,9 @@ public class AgentAuthorizeModeling implements Serializable {
     private Integer createAgentId;
 
     @TableField(exist = false)
+    private String createAgentName;
+
+    @TableField(exist = false)
     private String agentName;
 
     @TableField(exist = false)

+ 5 - 1
src/main/java/com/fdkankan/agent/service/impl/AgentAuthorizeModelingServiceImpl.java

@@ -68,7 +68,8 @@ public class AgentAuthorizeModelingServiceImpl extends ServiceImpl<IAgentAuthori
         wrapper.orderByDesc(AgentAuthorizeModeling::getId);
         Page<AgentAuthorizeModeling> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
         List<Integer> sysIds = page.getRecords().stream().map(AgentAuthorizeModeling::getAgentId).collect(Collectors.toList());
-
+        List<Integer> createIds = page.getRecords().stream().map(AgentAuthorizeModeling::getCreateAgentId).collect(Collectors.toList());
+        sysIds.addAll(createIds);
         HashMap<Integer, AgentNew> userMap = agentNewService.getMapByIds(sysIds);
         HashMap<Integer, IncrementUseType> typeMap = iIncrementUseTypeService.getTypeMap();
 
@@ -76,6 +77,9 @@ public class AgentAuthorizeModelingServiceImpl extends ServiceImpl<IAgentAuthori
             if(userMap.get(record.getAgentId())!=null){
                 record.setAgentName(userMap.get(record.getAgentId()).getNickName());
             }
+            if(userMap.get(record.getCreateAgentId())!=null){
+                record.setCreateAgentName(userMap.get(record.getCreateAgentId()).getNickName());
+            }
             if(typeMap.get(record.getUseType()) !=null){
                 record.setUseTypeStr(typeMap.get(record.getUseType()).getName());
             }