From c77d41503e1b79d47b0e33ed0b6e6003d5902293 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E6=95=8F?= Date: Wed, 11 Dec 2024 17:17:36 +0800 Subject: [PATCH] =?UTF-8?q?feature(REQ-3282):=20DO=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E7=94=A8SuperBuilder=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/cooperateship/entity/SaasCooperateShip.java | 13 ++++++++----- .../infra/dao/node/entity/OrganizationalNode.java | 5 +++-- .../dao/nodeuser/entity/OrganizationalNodeUser.java | 13 ++++++++----- .../orgmanax/infra/dao/orguser/entity/OrgUser.java | 12 ++++++++---- .../infra/dao/unit/entity/OrganizationalUnit.java | 13 ++++++++----- 5 files changed, 35 insertions(+), 21 deletions(-) diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/cooperateship/entity/SaasCooperateShip.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/cooperateship/entity/SaasCooperateShip.java index 6cc51a0..a8cf089 100644 --- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/cooperateship/entity/SaasCooperateShip.java +++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/cooperateship/entity/SaasCooperateShip.java @@ -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 { diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/node/entity/OrganizationalNode.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/node/entity/OrganizationalNode.java index 99ebf69..f88e7aa 100644 --- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/node/entity/OrganizationalNode.java +++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/node/entity/OrganizationalNode.java @@ -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 diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/nodeuser/entity/OrganizationalNodeUser.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/nodeuser/entity/OrganizationalNodeUser.java index 4cdde13..4fd2f8b 100644 --- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/nodeuser/entity/OrganizationalNodeUser.java +++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/nodeuser/entity/OrganizationalNodeUser.java @@ -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 { diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orguser/entity/OrgUser.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orguser/entity/OrgUser.java index 36e10da..b03439b 100644 --- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orguser/entity/OrgUser.java +++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orguser/entity/OrgUser.java @@ -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 { diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/entity/OrganizationalUnit.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/entity/OrganizationalUnit.java index 87f08ae..58b98fd 100644 --- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/entity/OrganizationalUnit.java +++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/unit/entity/OrganizationalUnit.java @@ -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 {