From f17c7abf82ee1c75c128934dc7523c2812d96234 Mon Sep 17 00:00:00 2001 From: yefei Date: Wed, 16 Aug 2023 17:58:43 +0800 Subject: [PATCH] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=A8=8E=E5=8F=B7=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/admin/sys/service/impl/SsoLoginServiceImpl.java | 5 ++++- .../com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java | 4 +++- dxhy-admin/src/main/resources/bootstrap-test.yaml | 4 ++-- 3 files changed, 9 insertions(+), 4 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 9ccca63a..55918389 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 @@ -5,6 +5,7 @@ import java.util.stream.Collectors; import javax.annotation.Resource; +import com.alibaba.fastjson.JSONArray; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -55,7 +56,9 @@ public class SsoLoginServiceImpl implements SsoLoginService { public boolean saveUser(SsoUser user) { String taxNoInfo = getTaxNoInfo(xxUrl, ""); - List taxnoList = JSONObject.parseArray(taxNoInfo,SaleTaxnoEntity.class); + JSONObject object = JSONObject.parseObject(taxNoInfo); + String taxnoListInfo = object.getString("groupInfo"); + List taxnoList = JSONObject.parseArray(taxnoListInfo,SaleTaxnoEntity.class); Map taxnos = taxnoList.stream().collect(Collectors.toMap(SaleTaxnoEntity::getGroupId, SaleTaxnoEntity::getXhfNsrsbh)); log.info("从销项获取的税号列表为:{}",taxnos); diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java index c5f069b1..790f504f 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java @@ -159,7 +159,9 @@ public class SysUserServiceImpl extends ServiceImpl i // 保存客户信息,更新企业税号 user.getUserOrgEntities().stream().forEach(userOrg -> { if(StringUtils.isEmpty(userOrg.getTaxno())){ - userOrg.setTaxno(taxnos.get(userOrg.getDeptId())); + if(StringUtils.isNotEmpty(taxnos.get(userOrg.getDeptId()))) { + userOrg.setTaxno(taxnos.get(userOrg.getDeptId())); + } } }); // 获取关联 数据权限 diff --git a/dxhy-admin/src/main/resources/bootstrap-test.yaml b/dxhy-admin/src/main/resources/bootstrap-test.yaml index 9a14a1c3..98020c70 100644 --- a/dxhy-admin/src/main/resources/bootstrap-test.yaml +++ b/dxhy-admin/src/main/resources/bootstrap-test.yaml @@ -6,7 +6,7 @@ spring: # Nacos config 地址 server-addr: 172.31.36.146:33000 # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace） - namespace: b271ba8e-84d9-4393-88b8-9271aff9465c + namespace: c8ce91b7-c3a9-4a6e-a354-8405ce60d66c # Nacos config 分组 group: dxhy-admin-group # Nacos config 登录用户名 @@ -24,4 +24,4 @@ spring: username: admin # Nacos config 登录密码 password: Invoice.nacos.!1 - namespace: b271ba8e-84d9-4393-88b8-9271aff9465c \ No newline at end of file + namespace: c8ce91b7-c3a9-4a6e-a354-8405ce60d66c \ No newline at end of file