From bae236fc3ed5f1aa273e4653a38c7c8622a88624 Mon Sep 17 00:00:00 2001 From: daihh Date: Fri, 1 Sep 2023 09:05:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=B5=84=E6=BA=90=E5=BD=92?= =?UTF-8?q?=E5=B1=9E=E6=9F=A5=E8=AF=A2=E5=8C=B9=E9=85=8D=E8=A7=84=E5=88=99?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E5=8F=AAMainList=E6=95=B0=E7=BB=84=E5=8C=B9?= =?UTF-8?q?=E9=85=8D=E3=80=82=E4=BF=AE=E6=94=B9=E4=B8=BA=20Main=20List?= =?UTF-8?q?=E5=92=8CReadonly=20List=20=E4=B8=A4=E4=B8=AA=E6=95=B0=E7=BB=84?= =?UTF-8?q?=E7=9A=84=E5=90=88=E9=9B=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/outside/OutSideDataServiceImpl.java | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java index 47f5e2b8..19ab5860 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java @@ -228,6 +228,7 @@ public class OutSideDataServiceImpl implements IOutSideDataService { public UserOrgIds getOrgIds() { UserOrgIds uids=new UserOrgIds(); List orgIds = new ArrayList<>(); + uids.setIds(orgIds); String token = TokenProxy.getToken(request); String type="application/json"; @@ -259,12 +260,29 @@ public class OutSideDataServiceImpl implements IOutSideDataService { // orgIds.add(elements.next().toString()); // } // } + Set orgSetIds = new HashSet<>();//用于排重判断 - if(rootNode.get("result")!=null & rootNode.get("result").get("mainList")!=null) { - JsonNode result = rootNode.get("result").get("mainList"); - Iterator elements = result.elements(); - while (elements.hasNext()){ - orgIds.add(elements.next().toString()); + if(rootNode.get("result")!=null) { + JsonNode mainList = rootNode.get("result").get("mainList"); + JsonNode readOnlyList = rootNode.get("result").get("readOnlyList"); + //主列表 + if(mainList!=null && !mainList.isEmpty()) { + Iterator elements = mainList.elements(); + while (elements.hasNext()){ + String oid=elements.next().toString(); + orgIds.add(oid); + orgSetIds.add(oid); + } + } + //只读列表 + if(readOnlyList!=null && !readOnlyList.isEmpty()) { + Iterator elements = readOnlyList.elements(); + while (elements.hasNext()){ + String oid=elements.next().toString(); + if(!orgSetIds.contains(oid)) { + orgIds.add(oid); + } + } } }