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

@@ -292,8 +292,7 @@ public class UserInfoServiceImpl implements UserInfoService {
             userEntity.setTaxplayercodeDeptList(taxPlayerCodeDeptListFilter);
         }
 
-        R r = R.ok(userEntity);
+        return R.ok(userEntity);
-                    return r;
     }
 
     @Override