wangli/orgmanax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feature(REQ-3282): DO对象，使用SuperBuilder；

Browse Source
This commit is contained in:
周敏 2024-12-11 17:17:36 +08:00
parent 90937eeb8d
commit c77d41503e
5 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/cooperateship/entity/SaasCooperateShip.java
View File

@ -1,18 +1,21 @@
package cn.axzo.orgmanax.infra.dao.cooperateship.entity;
import com.alibaba.fastjson.JSONObject;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import lombok.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import lombok.experimental.Accessors;
import lombok.experimental.SuperBuilder;
import java.io.Serializable;
import java.util.Date;
/**
* (SaasCooperateShip)表实体类
@ -25,7 +28,7 @@ import java.io.Serializable;
@Accessors(chain = true)
@NoArgsConstructor
@AllArgsConstructor
@Builder
@SuperBuilder
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = false)
public class SaasCooperateShip implements Serializable {

5
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/node/entity/OrganizationalNode.java
View File

@ -152,15 +152,16 @@ public class OrganizationalNode implements Serializable {
*
* @param parentNode
*/
public void calcPath(OrganizationalNode parentNode) {
public String calcPath(OrganizationalNode parentNode) {
if (Objects.equals(this.getParentId(), 0L)) {
this.topNodeId = id;
this.path = id + ",";
return;
return this.path;
}
Assert.notNull(parentNode, "重置路径时，父节点不能为空");
this.topNodeId = parentNode.getTopNodeId();
this.path = parentNode.path + id + ",";
return this.path;
}
@Getter

13
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/nodeuser/entity/OrganizationalNodeUser.java
View File

@ -1,18 +1,21 @@
package cn.axzo.orgmanax.infra.dao.nodeuser.entity;
import com.alibaba.fastjson.JSONObject;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import lombok.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import lombok.experimental.Accessors;
import lombok.experimental.SuperBuilder;
import java.io.Serializable;
import java.util.Date;
/**
* 组织人员表(OrganizationalNodeUser)表实体类
@ -25,7 +28,7 @@ import java.io.Serializable;
@Accessors(chain = true)
@NoArgsConstructor
@AllArgsConstructor
@Builder
@SuperBuilder
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = false)
public class OrganizationalNodeUser implements Serializable {

12
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orguser/entity/OrgUser.java
View File

@ -1,14 +1,18 @@
package cn.axzo.orgmanax.infra.dao.orguser.entity;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import lombok.experimental.Accessors;
import lombok.experimental.SuperBuilder;
import java.io.Serializable;
import java.util.Date;
/**
* 人员组织(OrgUser)表实体类
@ -21,7 +25,7 @@ import java.io.Serializable;
@Accessors(chain = true)
@NoArgsConstructor
@AllArgsConstructor
@Builder
@SuperBuilder
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = false)
public class OrgUser implements Serializable {

13
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/entity/OrganizationalUnit.java
View File

@ -1,18 +1,21 @@
package cn.axzo.orgmanax.infra.dao.unit.entity;
import com.alibaba.fastjson.JSONObject;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import lombok.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import lombok.experimental.Accessors;
import lombok.experimental.SuperBuilder;
import java.io.Serializable;
import java.util.Date;
/**
* 单位表(OrganizationalUnit)表实体类
@ -25,7 +28,7 @@ import java.io.Serializable;
@Accessors(chain = true)
@NoArgsConstructor
@AllArgsConstructor
@Builder
@SuperBuilder
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = false)
public class OrganizationalUnit implements Serializable {