diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssPerson.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssPerson.java index 3dc8ed53..e25034a0 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssPerson.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssPerson.java @@ -49,6 +49,10 @@ public class EssPerson extends BaseEntity implements OrgPerson { return state == EssPersonState.AUTHORIZED; } + public boolean is(Long personId) { + return this.personId != null && this.personId.equals(personId); + } + @Setter @Getter public static class RecordExt { diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssService.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssService.java index 920fed46..7e956835 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssService.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssService.java @@ -1,6 +1,16 @@ package cn.axzo.nanopart.ess.server.ess; +import static cn.axzo.nanopart.ess.server.utils.IdBuilder.idbuilder; + +import java.util.function.Function; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import com.tencentcloudapi.essbasic.v20210526.models.CreateSignUrlsResponse; +import com.tencentcloudapi.essbasic.v20210526.models.SignUrlInfo; + 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; @@ -30,16 +40,8 @@ import cn.axzo.nanopart.ess.server.ess.mq.EssBroadcaster; import cn.axzo.nanopart.ess.server.ess.support.OssService; import cn.axzo.nanopart.ess.server.utils.BizAssertions; import cn.axzo.nanopart.ess.server.utils.BizTransactional; -import com.tencentcloudapi.essbasic.v20210526.models.CreateSignUrlsResponse; -import com.tencentcloudapi.essbasic.v20210526.models.SignUrlInfo; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -import java.util.function.Function; - -import static cn.axzo.nanopart.ess.server.utils.IdBuilder.idbuilder; /** * @author yanglin @@ -119,7 +121,7 @@ public class EssService { if (!sealAndPerson.getSealPerson().isAuthorized()) return; EssPerson superAdmin = orgManager.getSuperAdminOrThrow(sealAndPerson.getSeal().getOuId()); - BizAssertions.assertFalse(superAdmin.getPersonId().equals(request.getPersonId()), "不能取消超级管理员的印章授权"); + BizAssertions.assertFalse(superAdmin.is(request.getPersonId()), "不能取消超级管理员的印章授权"); essClient.removeSealAuthorization(superAdmin, sealAndPerson.getSeal(), sealAndPerson.getSealPerson()); orgManager.removeSealAuthorization(request.getEssSealId(), request.getPersonId()); } diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/OrgManager.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/OrgManager.java index 82d364c8..043bc949 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/OrgManager.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/OrgManager.java @@ -176,8 +176,6 @@ public class OrgManager { EssSeal seal = essSealDao.findByEssSealId(request.getEssSealId()).orElse(null); BizAssertions.assertNotNull(seal, "印章不存在: {}", request.getEssSealId()); //noinspection DataFlowIssue - EssPerson superAdmin = getSuperAdminOrThrow(seal.getOuId()); - BizAssertions.assertFalse(superAdmin.getPersonId().equals(request.getPersonId()), "不能从印章列表删除超级管理员"); EssSealPerson sealPerson = essSealPersonDao.find(seal.getEssSealId(), request.getPersonId(), true).orElse(null); BizAssertions.assertNotNull(sealPerson, "印章人员不存在"); //noinspection DataFlowIssue