diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssContract.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssContract.java index 1d356808..0c07ee96 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssContract.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssContract.java @@ -1,7 +1,6 @@ package cn.axzo.nanopart.ess.server.entity; import cn.axzo.foundation.dao.support.mysql.type.BaseListTypeHandler; -import cn.axzo.nanopart.ess.api.domain.OrgPerson; import cn.axzo.nanopart.ess.api.domain.contract.Approver; import cn.axzo.nanopart.ess.api.domain.contract.EssApproveDetail; import cn.axzo.nanopart.ess.api.enums.EssContractState; @@ -17,7 +16,6 @@ import lombok.Getter; import lombok.Setter; import java.util.List; -import java.util.Optional; /** * @author yanglin @@ -82,7 +80,7 @@ public class EssContract extends BaseEntity { /** * 动态签署人信息 */ - @TableField(typeHandler = ApproverListHandler.class) + @TableField(typeHandler = FastjsonTypeHandler.class) private AssignedApprovers assignedApprovers; /** @@ -110,13 +108,6 @@ public class EssContract extends BaseEntity { return approvers.get(idx); } - public Optional findPreciseApprover(OrgPerson person) { - return approvers.stream() - .filter(approver -> approver.getOuId().equals(person.getOuId()) - && approver.getPersonId().equals(person.getPersonId())) - .findFirst(); - } - public ApproverAssignType getAssignType() { return assignedApprovers == null ? null : assignedApprovers.getAssignType(); }