1

src/main/java/com/fdkankan/agent/controller/AgentNewController.java

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 @RestController
 @RequestMapping("/agent/agentManage")
@@ -108,9 +109,14 @@ public class AgentNewController extends BaseController {
     }
 
     @GetMapping("/getSubAgent")
-    public ResultData getSubAgent(){
+    public ResultData getSubAgent(@RequestParam(required = false,defaultValue = "0") Integer type){
         Integer agentId = getAgent().getId();
-        return ResultData.ok(agentNewService.getBySubAgent(agentId));
+        List<AgentNew> bySubAgent = agentNewService.getBySubAgent(agentId);
+        if(type == 1){
+            AgentNew agentNew = agentNewService.getById(agentId);
+            bySubAgent.add(agentNew);
+        }
+        return ResultData.ok(bySubAgent);
     }
 
 }