From 71fef0b04b19bd74857f8b77c22b7de4a8b026fc Mon Sep 17 00:00:00 2001
From: zhaochengming <18706295423@163.com>
Date: Tue, 29 Mar 2022 09:45:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9C=81=E6=B5=8B=E5=88=97=E8=A1=A8--=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java  | 4 ++++
 .../com/pms/ocp/service/impl/OcpTenantIocnServiceImpl.java | 7 ++++---
 src/main/resources/mapper/OcpTenantBaseMapper.xml          | 6 ++++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java
index 9a0c0dd..6532738 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/OcpTenantIocnServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpTenantIocnServiceImpl.java
index 374ac7f..45be56b 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 0cd8618..c64e825 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>
+
+
 
 
 
-- 
2.26.0