gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【7.2.2】【system】更新组织机构的列表的获取

pull/29/head
fengshuonan 2022-05-20 18:19:31 +08:00
parent c7ca6a5842
commit 3e9e35d311
3 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/OrganizationTreeNode.java
View File

@ -29,6 +29,7 @@ import cn.stylefeng.roses.kernel.rule.tree.factory.base.AbstractTreeNode;
import cn.stylefeng.roses.kernel.rule.tree.xmtree.base.AbstractXmSelectNode;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
/**
@ -70,6 +71,42 @@ public class OrganizationTreeNode implements AbstractTreeNode<OrganizationTreeNo
@ChineseDescription("是否选中")
private boolean selected = false;
/**
* 组织名称
*/
@ChineseDescription("组织名称")
private String orgName;
/**
* 组织编码
*/
@ChineseDescription("组织编码")
private String orgCode;
/**
* 排序
*/
@ChineseDescription("排序")
private BigDecimal orgSort;
/**
* 状态：1-启用，2-禁用
*/
@ChineseDescription("状态：1-启用，2-禁用")
private Integer statusFlag;
/**
* 组织机构类型：1-公司，2-部门
*/
@ChineseDescription("组织机构类型：1-公司，2-部门")
private Integer orgType;
/**
* 组织机构描述
*/
@ChineseDescription("组织机构描述")
private String orgRemark;
/**
* 子节点的集合
*/

7
kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrganization.java
View File

@ -95,6 +95,13 @@ public class HrOrganization extends BaseEntity {
@ChineseDescription("状态：1-启用，2-禁用")
private Integer statusFlag;
/**
* 组织机构类型：1-公司，2-部门
*/
@TableField(value = "org_type")
@ChineseDescription("组织机构类型：1-公司，2-部门")
private Integer orgType;
/**
* 组织机构描述
*/

8
kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/factory/OrganizationFactory.java
View File

@ -52,6 +52,14 @@ public class OrganizationFactory {
treeNode.setId(hrOrganization.getOrgId());
treeNode.setParentId(hrOrganization.getOrgParentId());
treeNode.setTitle(hrOrganization.getOrgName());
treeNode.setOrgName(hrOrganization.getOrgName());
treeNode.setOrgCode(hrOrganization.getOrgCode());
treeNode.setStatusFlag(hrOrganization.getStatusFlag());
treeNode.setOrgSort(hrOrganization.getOrgSort());
treeNode.setOrgRemark(hrOrganization.getOrgRemark());
treeNode.setOrgType(hrOrganization.getOrgType());
return treeNode;
}