From 9c3e91da57e25ae8bc0bb29afb0006a95e815d28 Mon Sep 17 00:00:00 2001 From: yefei Date: Thu, 20 Apr 2023 11:22:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?ariesy=20=E8=A7=A3=E5=86=B3=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=8E=AF=E5=A2=83=E8=8F=9C=E5=8D=95=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E6=85=A2=E7=9A=84=E9=97=AE=E9=A2=98=20v1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/service/impl/SsoLoginServiceImpl.java | 57 ++++++++++++++----- .../BaseFpbrzServiceImpl.java | 2 + 2 files changed, 46 insertions(+), 13 deletions(-) diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SsoLoginServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SsoLoginServiceImpl.java index f16624a6..7723b141 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SsoLoginServiceImpl.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SsoLoginServiceImpl.java @@ -264,29 +264,60 @@ public class SsoLoginServiceImpl implements SsoLoginService { return roleIds; } +// public List toUserOrg(SsoUser user) { +// SysUserOrgEntity userOrg; +// List listUserOrg = new ArrayList<>(); +// List dataPerm = user.getDataPerm(); +// List taxplayercodeDeptList = user.getTaxplayercodeDeptList(); +// if (dataPerm != null && dataPerm.size() > 0) { +// for (Long deptId : dataPerm) { +// if (dataPerm.size() > 0) { +// for (com.xxl.sso.core.entity.SysDeptEntity sysDeptEntity : taxplayercodeDeptList) { +// log.debug("deptId : " + deptId + " sysDetp: " + sysDeptEntity.getDeptId()); +// if (deptId.longValue() == sysDeptEntity.getDeptId().longValue()) { +// userOrg = new SysUserOrgEntity(); +// userOrg.setCompany(AdminConfig.company); +// userOrg.setDeptId(sysDeptEntity.getDeptId()); +// userOrg.setTaxname(sysDeptEntity.getName()); +// userOrg.setTaxno(sysDeptEntity.getTaxpayerCode()); +// listUserOrg.add(userOrg); +// } +// } +// } +// } +// } +// log.debug("listUserOrg : " + listUserOrg.size() + " listUserOrgJson: " + JSON.toJSONString(listUserOrg)); +// return listUserOrg; +// } + public List toUserOrg(SsoUser user) { SysUserOrgEntity userOrg; + Map detpCollect = null; List listUserOrg = new ArrayList<>(); List dataPerm = user.getDataPerm(); List taxplayercodeDeptList = user.getTaxplayercodeDeptList(); + if(taxplayercodeDeptList != null && taxplayercodeDeptList.size() > 0){ + detpCollect = taxplayercodeDeptList.stream().collect(Collectors.toMap(com.xxl.sso.core.entity.SysDeptEntity::getDeptId, tri -> tri)); + } + if(detpCollect == null){ + return listUserOrg; + } if (dataPerm != null && dataPerm.size() > 0) { + for (Long deptId : dataPerm) { - if (dataPerm.size() > 0) { - for (com.xxl.sso.core.entity.SysDeptEntity sysDeptEntity : taxplayercodeDeptList) { - log.debug("deptId : " + deptId + " sysDetp: " + sysDeptEntity.getDeptId()); - if (deptId.longValue() == sysDeptEntity.getDeptId().longValue()) { - userOrg = new SysUserOrgEntity(); - userOrg.setCompany(AdminConfig.company); - userOrg.setDeptId(sysDeptEntity.getDeptId()); - userOrg.setTaxname(sysDeptEntity.getName()); - userOrg.setTaxno(sysDeptEntity.getTaxpayerCode()); - listUserOrg.add(userOrg); - } - } + com.xxl.sso.core.entity.SysDeptEntity deptEntity = detpCollect.get(deptId); + if(deptEntity != null){ + userOrg = new SysUserOrgEntity(); + userOrg.setCompany(AdminConfig.company); + userOrg.setDeptId(deptEntity.getDeptId()); + userOrg.setTaxname(deptEntity.getName()); + userOrg.setTaxno(deptEntity.getTaxpayerCode()); + listUserOrg.add(userOrg); } } + } - log.debug("listUserOrg : " + listUserOrg.size() + " listUserOrgJson: " + JSON.toJSONString(listUserOrg)); + log.info("listUserOrg : " + listUserOrg.size() + " listUserOrgJson: " + JSON.toJSONString(listUserOrg)); return listUserOrg; } diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpbrzServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpbrzServiceImpl.java index ef051aca..7ee79e98 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpbrzServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpbrzServiceImpl.java @@ -57,6 +57,7 @@ public class BaseFpbrzServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { @@ -65,6 +66,7 @@ public class BaseFpbrzServiceImpl extends MpBaseServiceImpl taxnoList = (List)pramsMap.get("gfsh"); From 06c77754fd28e1c9ce35bcb2ff49c3a00048e276 Mon Sep 17 00:00:00 2001 From: yefei Date: Thu, 20 Apr 2023 14:55:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E6=89=93?= =?UTF-8?q?=E5=8C=85=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index a93680a6..883cfd98 100644 --- a/pom.xml +++ b/pom.xml @@ -176,9 +176,9 @@ /home/dxhy/logs/ - - true - + + + @@ -220,9 +220,9 @@ /home/dxhy/logs/ - - - + + true +