diff --git a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java index b4adf8dc6faad6643891fd914f977453409d1214..986cb711e9f61d21c6d83e5564e0600cc6a5d71a 100644 --- a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java +++ b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java @@ -194,17 +194,17 @@ public class ApiBasicManagementController { return apiBasicManagementService.getBaseByGroupCode(ApiBaseReq); } - //@ApiOperation("服务树一级") - //@GetMapping("/apiBaseTree") - public ResponseVO> apiBaseTree(String apiGroupCompanyCode) { - List apiTreeGroupDtos = apiBasicManagementService.apiBaseTree(apiGroupCompanyCode); + @ApiOperation("服务树一级") + @GetMapping("/apiBaseTree") + public ResponseVO> apiBaseTree(String apiGroupCompanyCode, Integer apiGroupPromotionType) { + List apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode,null,apiGroupPromotionType); return ResponseVO.ok(apiTreeGroupDtos); } @ApiOperation("服务树层级") @GetMapping("/apiBaseTreeOther") - public ResponseVO> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode, Integer apiGroupPromotionType) { - List apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode,apiGroupPcode,apiGroupPromotionType); + public ResponseVO> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupCode, Integer apiGroupPromotionType) { + List apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode,apiGroupCode,apiGroupPromotionType); return ResponseVO.ok(apiTreeGroupDtos); } diff --git a/src/main/resources/mapper/OcpApiGroupMapper.xml b/src/main/resources/mapper/OcpApiGroupMapper.xml index 0b43e7fa85d8a11b28b8e02d9cf8905b6d82303a..e826579c1ab2af9d2a6df63603bfaf529eb92212 100644 --- a/src/main/resources/mapper/OcpApiGroupMapper.xml +++ b/src/main/resources/mapper/OcpApiGroupMapper.xml @@ -19,7 +19,7 @@