diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java b/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java index a4914a5..308fd24 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java @@ -3,8 +3,7 @@ package com.adc.da.sys.vo; import java.util.ArrayList; import java.util.List; -import com.adc.da.sys.entity.RoleEO; -import com.adc.da.sys.vo.iam.orgsIAM; +import com.adc.da.sys.vo.iam.OrgsShortVoIAM; import lombok.Data; @@ -50,6 +49,6 @@ public class UserVO { /** * 部门列表 */ - private List orgList = new ArrayList(); + private List orgList = new ArrayList(); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/vo/iam/OrgVoIAM.java b/adc-da-sys/src/main/java/com/adc/da/sys/vo/iam/OrgVoIAM.java new file mode 100644 index 0000000..b239672 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/vo/iam/OrgVoIAM.java @@ -0,0 +1,56 @@ +package com.adc.da.sys.vo.iam; + +import lombok.Data; + +/** + * IAM对应的org实体类 + */ +@Data +public class OrgVoIAM { + + /** + * 部门编码 + */ + private String orgCode; + + /** + * 部门名称 + */ + private String orgName; + + /** + * 部门级别 + */ + private Integer orgLevel; + + /** + * 父部门编码 + */ + private String supOrgCode; + + /** + * 部门简称 + */ + private String orgShortName; + + /** + * 归属地 + */ + private String attribution; + + /** + * 部门14位码 + */ + private String bmdm14; + + /** + * 状态,1正常,0停用,-1删除 + */ + private Integer status; + + /** + * 更新时间,格式:yyyy-MM-dd HH:mm:ss + */ + private String updateTime; + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/vo/iam/orgsIAM.java b/adc-da-sys/src/main/java/com/adc/da/sys/vo/iam/OrgsShortVoIAM.java similarity index 66% rename from adc-da-sys/src/main/java/com/adc/da/sys/vo/iam/orgsIAM.java rename to adc-da-sys/src/main/java/com/adc/da/sys/vo/iam/OrgsShortVoIAM.java index 918eca0..6817e3d 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/vo/iam/orgsIAM.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/vo/iam/OrgsShortVoIAM.java @@ -2,8 +2,12 @@ package com.adc.da.sys.vo.iam; import lombok.Data; +/** + * 部门的部分数据 + * 提供给UserEO绑定的实体类 + */ @Data -public class orgsIAM { +public class OrgsShortVoIAM { private String orgCode; // 组织编码