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 77b4cb3f277fd966524ebcaee0de9e832a34fb0a..6a85136558cd96d712480bae0eaa47f72c62023f 100644
--- a/src/main/java/com/pms/ocp/service/impl/OcpTenantIocnServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/OcpTenantIocnServiceImpl.java
@@ -15,7 +15,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
+import java.util.TreeSet;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 /**
@@ -42,7 +45,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);
@@ -74,10 +77,17 @@ public class OcpTenantIocnServiceImpl extends ServiceImpl<OcpTenantIocnMapper, O
             }
 
         }*/
-        List<OcpTenantGroupIocnDto> groupIocnDtos = ocpTenantBaseMapper.selectAlls();
+        List<OcpTenantGroupIocnDto> lists = new ArrayList<>();
+       List<OcpTenantGroupIocnDto> groupIocnDtos = ocpTenantBaseMapper.selectAlls();
+        for (OcpTenantGroupIocnDto groupIocnDto : groupIocnDtos) {
+            Short isDelete = groupIocnDto.getIsDelete();
+            if (isDelete == 0){
+                lists.add(groupIocnDto);
+            }
+        }
 
 
-        return groupIocnDtos;
+        return lists;
 
     }
 
@@ -96,6 +106,11 @@ public class OcpTenantIocnServiceImpl extends ServiceImpl<OcpTenantIocnMapper, O
             list.add(iocn);
         }
 
+
+        //去重
+//        msgs = msgs.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(Msg :: getMsgId))), ArrayList::new));
+
+
         for (byte[] bytes : list) {
             if (!(list.contains(bytes))){
                 list.add(bytes);