diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java
index 9a0c0ddd198b25c6fa617d9f68077a19d47703aa..65327384abfb7bddd3177f46715ea30288b3e09f 100644
--- a/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java
+++ b/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java
@@ -1,6 +1,7 @@
 package com.pms.ocp.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.dto.OcpTenantGroupIocnDto;
 import com.pms.ocp.model.entity.OcpTenantBase;
 
 import java.util.List;
@@ -11,4 +12,7 @@ public interface OcpTenantBaseMapper extends BaseMapper<OcpTenantBase> {
 
     OcpTenantBase updataIsDelect(String objId,Short isDelete);
 
+
+    List<OcpTenantGroupIocnDto> selectAlls();
+
 }
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 ea092e70c2a89f030c3f09ec5b6e828f22d9911d..2e23cb575c226b387191f3bca49a17ab38849692 100644
--- a/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java
@@ -33,7 +33,7 @@ public class OcpTenantBaseServiceImpl extends ServiceImpl<OcpTenantBaseMapper, O
     public boolean delectApply(String objId) {
 
 
-        if (StringUtils.isNotBlank(objId)) {
+        if (StringUtils.isBlank(objId)) {
             return false;
         }
         OcpTenantBase ocpTenantBase = ocpTenantBaseMapper.selectById(objId);
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 374ac7ff78beedf005dd2c8745a1534f941ab4ca..45be56bad13d9c73bb1d0fbca62237be2eb02b01 100644
--- a/src/main/java/com/pms/ocp/service/impl/OcpTenantIocnServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/OcpTenantIocnServiceImpl.java
@@ -41,7 +41,7 @@ public class OcpTenantIocnServiceImpl extends ServiceImpl<OcpTenantIocnMapper, O
      */
     @Override
     public List<OcpTenantGroupIocnDto> getApplyUserList() {
-        List<OcpTenantGroupIocnDto> groupIocnDtos = new ArrayList<>();
+      /*  List<OcpTenantGroupIocnDto> groupIocnDtos = new ArrayList<>();
         List<OcpTenantBase> ocpTenantBases = ocpTenantBaseMapper.selectList(null);
         List<OcpTenantIocn> ocpTenantIocns = ocpTenantIocnMapper.selectList(null);
         List<OcpTenantExtent> ocpTenantExtents = ocpTenantExtentMapper.selectList(null);
@@ -72,9 +72,10 @@ public class OcpTenantIocnServiceImpl extends ServiceImpl<OcpTenantIocnMapper, O
                 groupIocnDtos.add(ocpTenantGroupIocnDto);
             }
 
-        }
+        }*/
+        List<OcpTenantGroupIocnDto> groupIocnDtos = ocpTenantBaseMapper.selectAlls();
+
         return groupIocnDtos;
     }
 
-
 }
diff --git a/src/main/resources/mapper/OcpTenantBaseMapper.xml b/src/main/resources/mapper/OcpTenantBaseMapper.xml
index 0cd86188cfb70acd9d9096dec32323ec14ad1efb..c64e825ab92dfc39f0ddecc4bac7b0228df62f51 100644
--- a/src/main/resources/mapper/OcpTenantBaseMapper.xml
+++ b/src/main/resources/mapper/OcpTenantBaseMapper.xml
@@ -12,6 +12,12 @@
         UPDATE ocp_tenant_base SET is_delete = #{isDelete} WHERE obj_id = #{objId};
     </select>
 
+    <select id="selectAlls" resultType="com.pms.ocp.model.dto.OcpTenantGroupIocnDto">
+       SELECT * FROM ocp_tenant_base AS base ,ocp_tenant_extent AS extent,ocp_tenant_iocn as iocn
+  WHERE base.tenant_code = extent.tenant_code and base.tenant_code = code_no ORDER BY base.tenant_mtime DESC;
+    </select>
+
+