Merge remote-tracking branch 'origin/dev-dept-tree' into release

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;
     /**
      * 组织子节点集合
      */

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java

@@ -232,6 +232,7 @@ public class GroupManagementServiceImpl implements GroupManagementService {
             //扩展字段
             Map<String, Object> extra = new HashMap<>();
             extra.put("enterpriseNumbers", taxPlayerCodeDept.getDeptId());
+            extra.put("zzbm",taxPlayerCodeDept.getEnterpriseNumbers());
             treeNode.setExtra(extra);
             nodeList.add(treeNode);
         });
@@ -254,6 +255,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<GroupTreeVO> childGroupTreeVOList = transGroupTreeVo(tree.getChildren());
                 groupTreeVo.setChildren(childGroupTreeVOList);

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.CODE, "9999");
-                                r.put(OrderManagementConstant.ALL_MESSAGE, "用户未设置企业信息");
+                r.put(OrderManagementConstant.ALL_MESSAGE, "用户未设置企业信息");
-                                return r;
+                return r;
-                            }
+            }
-                            if (userEntity.getTaxplayercodeDeptList().size() < 1) {
+            if (userEntity.getTaxplayercodeDeptList().size() < 1) {
                 R r = new R();
-                                r.put(OrderManagementConstant.CODE, "9999");
+                r.put(OrderManagementConstant.CODE, "9999");
-                                r.put(OrderManagementConstant.ALL_MESSAGE, "用户未设置企业信息");
+                r.put(OrderManagementConstant.ALL_MESSAGE, "用户未设置企业信息");
-                                return r;
+                return r;
-                            }
+            }
-                    } else {
+        } else {
             log.error("{}查询用户信息数据为空", LOGGER_MSG);
             return R.error();
         }
@@ -271,7 +271,7 @@ public class UserInfoServiceImpl implements UserInfoService {
             List<TaxPlayerCodeDept> 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.ok(userEntity);
-                    return r;
+    }
-                }
 
     @Override
     public DeptEntity getDepartment() {