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> getResources( - @PathVariable("type") Integer type) { + @PathVariable("type") Integer type,@PathVariable("teamType") Integer teamType) { Map 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 { List list(Teaminfo teaminfo); Long count(Teaminfo teaminfo); - List queryByType(Integer type); + List queryByType(Integer type,Integer teamType); Map 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 i } @Override - public List queryByType(Integer type) { + public List queryByType(Integer type, Integer teamType) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("type", type); + queryWrapper.eq("team_type", teamType == null ? 0 : teamType); queryWrapper.orderByAsc("id"); return this.list(queryWrapper); }