From 874ab95e53f722cf0c2656e37716c2914d2b85ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E8=8D=A3=E7=90=B3?= Date: Fri, 1 Sep 2023 16:18:02 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feature=EF=BC=9A=E5=BC=80=E7=A5=A8=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=B7=BB=E5=8A=A0=E5=85=AC=E5=8F=B8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/GroupManagementServiceImpl.java | 2 +- .../service/impl/UserInfoServiceImpl.java | 36 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java index 3253db74..57608dc6 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java @@ -229,7 +229,7 @@ public class GroupManagementServiceImpl implements GroupManagementService { } //扩展字段 Map extra = new HashMap<>(); - extra.put("enterpriseNumbers", taxPlayerCodeDept.getDeptId()); + extra.put("enterpriseNumbers", taxPlayerCodeDept.getEnterpriseNumbers()); treeNode.setExtra(extra); nodeList.add(treeNode); }); diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java index db567091..cbccfb01 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java @@ -187,7 +187,7 @@ public class UserInfoServiceImpl implements UserInfoService { if (ConfigureConstant.STRING_0.equals(userCenterType)) { try { headMap.put("Cookie", "dxhy_sso_sessionid=" + userToken); - String result = HttpUtils.doGetWithHeader(userCenterConfig.configQueryBigBUserInfo(), headMap); + String result = HttpUtils.doGetWithHeader(userCenterConfig.configQueryBigBUserInfo(), headMap); if (StringUtils.isBlank(result)) { return R.error().put(OrderManagementConstant.CODE, ConfigureConstant.INT_401) @@ -198,7 +198,7 @@ public class UserInfoServiceImpl implements UserInfoService { if (r.get(OrderManagementConstant.CODE) == null || ConfigureConstant.INT_200 != Integer.parseInt(r.get(OrderManagementConstant.CODE).toString())) { if (ObjectUtil.isNull(r.get(OrderManagementConstant.ALL_MESSAGE)) && ObjectUtil.isNotNull(r.get(OrderManagementConstant.MESSAGE))) { r.put(OrderManagementConstant.ALL_MESSAGE, r.get(OrderManagementConstant.MESSAGE)); - return r; + return r; } } SsoUser ssoUser = JsonUtils.getInstance().parseObject(r.get(OrderManagementConstant.DATA).toString(), SsoUser.class); @@ -212,7 +212,7 @@ public class UserInfoServiceImpl implements UserInfoService { return R.error(); } - } else { + } else { try { headMap.put(ConfigureConstant.AUTHORIZATION, ConfigureConstant.BEARER + "" + userToken); String result = HttpUtils.doGetWithHeader(userCenterConfig.configQuerySaaSUserInfo(), headMap); @@ -238,19 +238,19 @@ public class UserInfoServiceImpl implements UserInfoService { } if (Objects.nonNull(userEntity)) { - if (userEntity.getTaxplayercodeDeptList() == null) { + if (userEntity.getTaxplayercodeDeptList() == null) { R r = new R(); - r.put(OrderManagementConstant.CODE, "9999"); - r.put(OrderManagementConstant.ALL_MESSAGE, "用户未设置企业信息"); - return r; - } - if (userEntity.getTaxplayercodeDeptList().size() < 1) { + r.put(OrderManagementConstant.CODE, "9999"); + r.put(OrderManagementConstant.ALL_MESSAGE, "用户未设置企业信息"); + return r; + } + if (userEntity.getTaxplayercodeDeptList().size() < 1) { R r = new R(); - r.put(OrderManagementConstant.CODE, "9999"); - r.put(OrderManagementConstant.ALL_MESSAGE, "用户未设置企业信息"); - return r; - } - } else { + r.put(OrderManagementConstant.CODE, "9999"); + r.put(OrderManagementConstant.ALL_MESSAGE, "用户未设置企业信息"); + return r; + } + } else { log.error("{}查询用户信息数据为空", LOGGER_MSG); return R.error(); } @@ -271,7 +271,7 @@ public class UserInfoServiceImpl implements UserInfoService { List taxplayercodeDeptList = userEntity.getTaxplayercodeDeptList(); //补全税号为空的数据 completeTaxPlayerCodeDept(taxplayercodeDeptList); - } + } //是否过滤调空税号的数据 if (OrderInfoEnum.ORDER_USER_INFO_IS_FILTER_1.getKey().equals(userInfoQuery.getIsFilter())) { @@ -292,9 +292,8 @@ public class UserInfoServiceImpl implements UserInfoService { userEntity.setTaxplayercodeDeptList(taxPlayerCodeDeptListFilter); } - R r = R.ok(userEntity); - return r; - } + return R.ok(userEntity); + } @Override public DeptEntity getDepartment() { @@ -575,6 +574,7 @@ public class UserInfoServiceImpl implements UserInfoService { taxPlayerCodeDept.setQd(""); taxPlayerCodeDept.setQdmc(""); taxPlayerCodeDept.setZcsj(""); + taxPlayerCodeDept.setEnterpriseNumbers(sysDeptEntity.getEnterpriseNumbers()); List roleList = new ArrayList<>(); for (SysRoleEntity role : ssoUser.getRoles()) { From 21cd5f348cdaeca92d281cd2ecd51fc4b29ac650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E8=8D=A3=E7=90=B3?= Date: Wed, 13 Sep 2023 15:04:56 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feature:=E5=BC=80=E7=A5=A8=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E8=BF=94=E5=9B=9EenterpriseNumbers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thirdservice/user/service/impl/UserInfoServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java index cbccfb01..d2bfcf5a 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java @@ -574,7 +574,6 @@ public class UserInfoServiceImpl implements UserInfoService { taxPlayerCodeDept.setQd(""); taxPlayerCodeDept.setQdmc(""); taxPlayerCodeDept.setZcsj(""); - taxPlayerCodeDept.setEnterpriseNumbers(sysDeptEntity.getEnterpriseNumbers()); List roleList = new ArrayList<>(); for (SysRoleEntity role : ssoUser.getRoles()) { From e79dd72c250324fa3d459518a696705d322a9f83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E8=8D=A3=E7=90=B3?= Date: Mon, 18 Sep 2023 15:06:07 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feature:=E7=BB=84=E7=BB=87=E6=A0=91?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BB=84=E7=BB=87=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/GroupManagementServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java index 57608dc6..304189ed 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java @@ -229,7 +229,8 @@ public class GroupManagementServiceImpl implements GroupManagementService { } //扩展字段 Map extra = new HashMap<>(); - extra.put("enterpriseNumbers", taxPlayerCodeDept.getEnterpriseNumbers()); + extra.put("enterpriseNumbers", taxPlayerCodeDept.getDeptId()); + extra.put("zzbm",taxPlayerCodeDept.getEnterpriseNumbers()); treeNode.setExtra(extra); nodeList.add(treeNode); }); From 938eca2f5d81c60cbfdfeecceb32272310717c05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E8=8D=A3=E7=90=B3?= Date: Mon, 18 Sep 2023 15:24:07 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feature:=E5=BC=80=E7=A5=A8=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=A0=91=E8=BF=94=E5=9B=9E=E7=BB=84=E7=BB=87=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baseservice/module/groupmanagement/model/GroupTreeVO.java | 4 ++++ .../service/impl/GroupManagementServiceImpl.java | 1 + 2 files changed, 5 insertions(+) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/model/GroupTreeVO.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/model/GroupTreeVO.java index 381e319c..3124a4ca 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/model/GroupTreeVO.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/model/GroupTreeVO.java @@ -24,6 +24,10 @@ public class GroupTreeVO { * 企业编码 */ private String enterpriseNumbers; + /** + * 组织代码 + */ + private String zzbm; /** * 组织子节点集合 */ diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java index 304189ed..6aa793f4 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java @@ -253,6 +253,7 @@ public class GroupManagementServiceImpl implements GroupManagementService { groupTreeVo.setId(tree.getId()); groupTreeVo.setLabel(tree.getName().toString()); groupTreeVo.setEnterpriseNumbers((String) tree.get("enterpriseNumbers")); + groupTreeVo.setZzbm((String) tree.get("zzbm")); if (CollectionUtil.isNotEmpty(tree.getChildren())) { List childGroupTreeVOList = transGroupTreeVo(tree.getChildren()); groupTreeVo.setChildren(childGroupTreeVOList);