From 5f7684698e3748ff74193f708cf72e38d2159d08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=8E=89=E4=B8=9C?=
 <129883742+liyudong2018@users.noreply.github.com>
Date: Sat, 20 Sep 2025 22:06:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hivekion/baseData/controller/ScenarioController.java  | 8 ++++----
 .../java/com/hivekion/team/service/ITeaminfoService.java  | 2 +-
 .../hivekion/team/service/impl/TeaminfoServiceImpl.java   | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/hivekion/baseData/controller/ScenarioController.java b/src/main/java/com/hivekion/baseData/controller/ScenarioController.java
index df9ae0f..4469364 100644
--- a/src/main/java/com/hivekion/baseData/controller/ScenarioController.java
+++ b/src/main/java/com/hivekion/baseData/controller/ScenarioController.java
@@ -190,10 +190,10 @@ public class ScenarioController extends BaseController {
    * @param type 类型
    * @return 资源信息
    */
-  @GetMapping("/resources/{type}")
+  @GetMapping("/resources/{type}/{teamType}")
   public ResponseData<List<ScenarioResource>> getResources(
 
-      @PathVariable("type") Integer type) {
+      @PathVariable("type") Integer type,@PathVariable("teamType") Integer teamType) {
     Map<String, String> iconMap = iconService.iconMap();
     switch (type) {
       case 1:
@@ -210,10 +210,10 @@ public class ScenarioController extends BaseController {
             convertEntityToResource(type, tblEntityService.selectAllChild(3), iconMap));
       case 5:
         return ResponseData.success(
-            covertTeamInfoToResource(type, iTeaminfoService.queryByType(0), iconMap));
+            covertTeamInfoToResource(type, iTeaminfoService.queryByType(0,teamType), iconMap));
       case 6:
         return ResponseData.success(
-            covertTeamInfoToResource(type, iTeaminfoService.queryByType(1), iconMap));
+            covertTeamInfoToResource(type, iTeaminfoService.queryByType(1,teamType), iconMap));
       case 7:
         return ResponseData.success(
               covertBuildInfoToResource(type,iResourceService.listAllBuildResourceByType(7),iconMap));
diff --git a/src/main/java/com/hivekion/team/service/ITeaminfoService.java b/src/main/java/com/hivekion/team/service/ITeaminfoService.java
index afc0f03..2b5f8f8 100644
--- a/src/main/java/com/hivekion/team/service/ITeaminfoService.java
+++ b/src/main/java/com/hivekion/team/service/ITeaminfoService.java
@@ -17,6 +17,6 @@ public interface ITeaminfoService extends IService<Teaminfo> {
   List<Teaminfo> list(Teaminfo teaminfo);
 
   Long count(Teaminfo teaminfo);
-  List<Teaminfo> queryByType(Integer type);
+  List<Teaminfo> queryByType(Integer type,Integer teamType);
   Map<Integer,Teaminfo> teamInfoMap();
 }
diff --git a/src/main/java/com/hivekion/team/service/impl/TeaminfoServiceImpl.java b/src/main/java/com/hivekion/team/service/impl/TeaminfoServiceImpl.java
index 5134485..9005ffd 100644
--- a/src/main/java/com/hivekion/team/service/impl/TeaminfoServiceImpl.java
+++ b/src/main/java/com/hivekion/team/service/impl/TeaminfoServiceImpl.java
@@ -33,9 +33,10 @@ public class TeaminfoServiceImpl extends ServiceImpl<TeaminfoMapper, Teaminfo> i
   }
 
   @Override
-  public List<Teaminfo> queryByType(Integer type) {
+  public List<Teaminfo> queryByType(Integer type, Integer teamType) {
     QueryWrapper<Teaminfo> queryWrapper = new QueryWrapper<>();
     queryWrapper.eq("type", type);
+    queryWrapper.eq("team_type", teamType == null ? 0 : teamType);
     queryWrapper.orderByAsc("id");
     return this.list(queryWrapper);
   }