Merge remote-tracking branch 'origin/master'

src/main/java/com/pms/ocp/controller/OcpApiTreeController.java

@@ -45,12 +45,18 @@ public class OcpApiTreeController {
     }
 
 
+    /**
+     * 服务树分类--新增---
+     *
+     * @param ocpApiGroup
+     * @return
+     */
     @PostMapping("/instertree")
     @ApiOperation("服务树分类--新增")
     public ResponseVO inseter(@RequestBody OcpApiGroup ocpApiGroup){
         OcpApiGroup ocpApiGroup1 = service.insertTree(ocpApiGroup);
-        if (StringUtils.isBlank(ocpApiGroup1.getApiGroupName())){
-            return ResponseVO.error("服务名称已经存在");
+        if (StringUtils.isBlank(ocpApiGroup1.getApiGroupCode())){
+            return ResponseVO.error("服务名称已经存在!");
         }else {
             return ResponseVO.ok(ocpApiGroup1);
         }

src/main/java/com/pms/ocp/service/impl/OcpTenantIocnServiceImpl.java

@@ -75,6 +75,7 @@ public class OcpTenantIocnServiceImpl extends ServiceImpl<OcpTenantIocnMapper, O
         }*/
         List<OcpTenantGroupIocnDto> groupIocnDtos = ocpTenantBaseMapper.selectAlls();
 
+
         return groupIocnDtos;
 
     }