diff --git a/src/main/java/com/pms/ocp/controller/OcpTenantGroupIocnController.java b/src/main/java/com/pms/ocp/controller/OcpTenantGroupIocnController.java
index 14bdc96505ff7e9a298e2d1f8f9dc3dd04e5587a..726377334bbdd7c3d688c8ae8a6a45183894a640 100644
--- a/src/main/java/com/pms/ocp/controller/OcpTenantGroupIocnController.java
+++ b/src/main/java/com/pms/ocp/controller/OcpTenantGroupIocnController.java
@@ -20,7 +20,7 @@ import java.util.List;
 @Slf4j
 @RequestMapping("/tenant-group/v1")
 @RestController
-@Api(tags = "我的应用-服务列表")
+@Api(tags = "应用接入-我的应用-服务列表")
 public class OcpTenantGroupIocnController {
 
 
@@ -51,7 +51,12 @@ public class OcpTenantGroupIocnController {
     @ApiModelProperty("我的应用--应用删除")
     private ResponseVO delectApplyUser(String objId) {
         boolean falg = ocpTenantBaseService.delectApply(objId);
-        return ResponseVO.ok(falg);
+        if (falg){
+            return ResponseVO.ok(falg);
+        }else {
+            return ResponseVO.error("请点击需要删除的应用！");
+        }
+
     }
 
 
diff --git a/src/main/java/com/pms/ocp/model/dto/OcpTenantGroupIocnDto.java b/src/main/java/com/pms/ocp/model/dto/OcpTenantGroupIocnDto.java
index bf9594fa498edf19d4494d761810778a5035875d..f03bc8ec5914521e5e59a7333c2b8253ae89d30e 100644
--- a/src/main/java/com/pms/ocp/model/dto/OcpTenantGroupIocnDto.java
+++ b/src/main/java/com/pms/ocp/model/dto/OcpTenantGroupIocnDto.java
@@ -11,6 +11,10 @@ import java.sql.Timestamp;
 @Data
 public class OcpTenantGroupIocnDto {
 
+
+    @ApiModelProperty("应用id")
+    private String objId;
+
     @ApiModelProperty("应用名称")
     private String tenantName;
 
@@ -141,12 +145,73 @@ public class OcpTenantGroupIocnDto {
     private String tenantFullPath;
 
 
+    /**
+     * 图标种类tenant:应用图标api:服务图标
+     */
+    @ApiModelProperty(value = "图标种类——tenant:应用图标,api:服务图标")
+    private String iocnType;
+
+    /**
+     * 编码值
+     */
+    @ApiModelProperty(value = "编码值")
+    private String codeNo;
+
+    /**
+     * 应用调用的服务数量图标数据
+     */
+    @ApiModelProperty(value = "应用调用的服务数量图标数据")
+    private Object iocn;
+
     /**
      * 所属公司可能会根据公司分区
      */
     @ApiModelProperty(value = "所属公司可能会根据公司分区")
     private String companyCode;
 
+    @ApiModelProperty("应用状态 '0: ''待审核'',1: ''已审核'',2: ''未通过'', 3: ''未提交'',4:''建设中'',5:''下架'',6:''发布'''")
+    private Short tenantState;
+
+    public Short getTenantState() {
+        return tenantState;
+    }
+
+    public void setTenantState(Short tenantState) {
+        this.tenantState = tenantState;
+    }
+
+    public String getIocnType() {
+        return iocnType;
+    }
+
+    public void setIocnType(String iocnType) {
+        this.iocnType = iocnType;
+    }
+
+    public String getCodeNo() {
+        return codeNo;
+    }
+
+    public void setCodeNo(String codeNo) {
+        this.codeNo = codeNo;
+    }
+
+    public Object getIocn() {
+        return iocn;
+    }
+
+    public void setIocn(Object iocn) {
+        this.iocn = iocn;
+    }
+
+    public String getObjId() {
+        return objId;
+    }
+
+    public void setObjId(String objId) {
+        this.objId = objId;
+    }
+
     public String getTenantName() {
         return tenantName;
     }
diff --git a/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java
index 9ee14cdc159f34032b450310d3390b08e1926f1b..feee97389f824263c83330e84d08736ca8dc6f90 100644
--- a/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java
@@ -1,5 +1,6 @@
 package com.pms.ocp.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pms.ocp.mapper.OcpTenantBaseMapper;
 import com.pms.ocp.model.entity.OcpTenantBase;
@@ -23,6 +24,11 @@ public class OcpTenantBaseServiceImpl extends ServiceImpl<OcpTenantBaseMapper, O
      */
     @Override
     public boolean delectApply(String objId) {
+
+
+        if (StringUtils.isNotBlank(objId)){
+            return false;
+        }
         OcpTenantBase ocpTenantBase = ocpTenantBaseMapper.selectById(objId);
         ocpTenantBase.setIsDelete((short) 1);
         ocpTenantBaseMapper.updateById(ocpTenantBase);
diff --git a/src/main/java/com/pms/ocp/service/impl/OcpTenantIocnServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpTenantIocnServiceImpl.java
index 68f13c0d88dc456544f81ba1223be01c5f60b643..7ae795a96e3808c42d058c4b393cea7d289982cb 100644
--- a/src/main/java/com/pms/ocp/service/impl/OcpTenantIocnServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/OcpTenantIocnServiceImpl.java
@@ -3,9 +3,11 @@ package com.pms.ocp.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pms.ocp.mapper.OcpTenantBaseMapper;
+import com.pms.ocp.mapper.OcpTenantExtentMapper;
 import com.pms.ocp.mapper.OcpTenantIocnMapper;
 import com.pms.ocp.model.dto.OcpTenantGroupIocnDto;
 import com.pms.ocp.model.entity.OcpTenantBase;
+import com.pms.ocp.model.entity.OcpTenantExtent;
 import com.pms.ocp.model.entity.OcpTenantIocn;
 import com.pms.ocp.service.OcpTenantIocnService;
 import org.springframework.beans.BeanUtils;
@@ -26,6 +28,10 @@ public class OcpTenantIocnServiceImpl extends ServiceImpl<OcpTenantIocnMapper, O
     @Autowired
     private OcpTenantIocnMapper ocpTenantIocnMapper;
 
+
+    @Autowired
+    private OcpTenantExtentMapper ocpTenantExtentMapper;
+
     /**
      * 我的应用--服务列表
      *
@@ -36,19 +42,25 @@ public class OcpTenantIocnServiceImpl extends ServiceImpl<OcpTenantIocnMapper, O
         List<OcpTenantGroupIocnDto> groupIocnDtos = new ArrayList<>();
         List<OcpTenantBase> ocpTenantBases = ocpTenantBaseMapper.selectList(null);
         List<OcpTenantIocn> ocpTenantIocns = ocpTenantIocnMapper.selectList(null);
-        List<String> companyCodes = new ArrayList<>();
+        List<OcpTenantExtent> ocpTenantExtents = ocpTenantExtentMapper.selectList(null);
         for (OcpTenantBase ocpTenantBase : ocpTenantBases) {
             OcpTenantGroupIocnDto ocpTenantGroupIocnDto = new OcpTenantGroupIocnDto();
             if (ocpTenantBase.getIsDelete() == 0) {
                 BeanUtils.copyProperties(ocpTenantBase, ocpTenantGroupIocnDto);
-                String ownerCompanyCode = ocpTenantBase.getOwnerCompanyCode();
-                ocpTenantGroupIocnDto.setCompanyCode(ownerCompanyCode);
-                groupIocnDtos.add(ocpTenantGroupIocnDto);
+                String tenantCode = ocpTenantBase.getTenantCode();
+//                ocpTenantGroupIocnDto.setCompanyCode(ownerCompanyCode);
                 for (OcpTenantIocn ocpTenantIocn : ocpTenantIocns) {
-                    if (ocpTenantIocn.getCompanyCode().equals(ocpTenantBase.getOwnerCompanyCode())){
+                    if (tenantCode.equals(ocpTenantIocn.getCodeNo())){
                         BeanUtils.copyProperties(ocpTenantIocn, ocpTenantGroupIocnDto);
                     }
                 }
+                    for (OcpTenantExtent ocpTenantExtent : ocpTenantExtents) {
+                        if (ocpTenantBase.getTenantCode().equals(ocpTenantBase.getTenantCode())){
+                        Short tenantState = ocpTenantExtent.getTenantState();
+                        ocpTenantGroupIocnDto.setTenantState(tenantState);
+                    }
+                }
+                groupIocnDtos.add(ocpTenantGroupIocnDto);
             }
         }
         return groupIocnDtos;