Merge remote-tracking branch 'origin/dev' into dev

server-service/src/main/java/com/makeit/service/platform/auth/PlatOrgService.java

@@ -108,4 +108,12 @@ public interface PlatOrgService extends IService<PlatOrg> {
     PlatOrgSplitDTO getOrgSplitVO(String orgId);
     PlatOrgSplitDTO getOrgSplitVO(String orgId);
 
 
     PageVO<PlatOrg> childPage(PageReqDTO<PlatOrgQueryDTO> pageReqDTO);
     PageVO<PlatOrg> childPage(PageReqDTO<PlatOrgQueryDTO> pageReqDTO);
+
+    /**
+     * 排除租户账号
+     *
+     * @param param
+     * @return
+     */
+    List<PlatOrg> belongToScopeListIgnoreTenant(PlatOrg param);
 }
 }

server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatOrgServiceImpl.java

@@ -697,4 +697,18 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
 
 
         return PageUtil.toPageVO(pageList.getRecords(), pageList);
         return PageUtil.toPageVO(pageList.getRecords(), pageList);
     }
     }
+
+    @Override
+    public List<PlatOrg> belongToScopeListIgnoreTenant(PlatOrg param) {
+        PlatUserVO userVO = PlatUserUtil.getUserVOCanNull();
+        //平台账号
+        Set<String> orgIdList = getOrgIdListByUserId(userVO.getId());
+        List<PlatOrg> orgList = this.list(new LambdaQueryWrapper<PlatOrg>()
+                .eq(StringUtils.isNotEmpty(param.getType()), PlatOrg::getType, param.getType())
+                .in(BaseEntity::getId, orgIdList).eq(PlatOrg::getStatus, CommonEnum.YES.getValue()));
+        if (CollectionUtils.isEmpty(orgList)) {
+            return new ArrayList<>();
+        }
+        return orgList;
+    }
 }
 }