From cfbfde37099aa4a1ff6cbedff334b2c91112ca71 Mon Sep 17 00:00:00 2001
From: yanglin <yanglin@axzo.cn>
Date: Tue, 25 Feb 2025 18:21:28 +0800
Subject: [PATCH] =?UTF-8?q?REQ-3581:=20=E8=AE=B0=E5=BD=95=E8=85=BE?=
 =?UTF-8?q?=E8=AE=AF=E5=BC=82=E5=B8=B8=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/axzo/nanopart/ess/server/ess/EssService.java | 4 ++--
 .../main/java/cn/axzo/nanopart/ess/server/ess/OrgManager.java | 2 +-
 .../java/cn/axzo/nanopart/ess/server/ess/QueryService.java    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

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 9da0a531..75e86ade 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
@@ -95,7 +95,7 @@ public class EssService {
         essLogDao.logRequest("essAddSealAuthorization", subject, request);
         SealAndPerson sealAndPerson = getSealAndPersonOrThrow(request);
         EssSealPerson sealPerson = sealAndPerson.getSealPerson();
-        if (sealPerson.getIsAuthorized().isYes())
+        if (sealPerson.isAuthorized())
             return;
         EssPerson essPerson = essPersonDao.findOrNull(sealPerson);
         BizAssertions.assertNotNull(essPerson, "人员不存在: {}", sealPerson.getPersonId());
@@ -113,7 +113,7 @@ public class EssService {
                 .build();
         essLogDao.logRequest("essRemoveSealAuthorization", subject, request);
         SealAndPerson sealAndPerson = getSealAndPersonOrThrow(request);
-        if (sealAndPerson.getSealPerson().getIsAuthorized().isNo())
+        if (!sealAndPerson.getSealPerson().isAuthorized())
             return;
         EssPerson superAdmin = orgManager.getSuperAdminOrThrow(sealAndPerson.getSeal().getOuId());
         BizAssertions.assertFalse(superAdmin.getPersonId().equals(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 2fd4d2f7..51609292 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
@@ -187,7 +187,7 @@ public class OrgManager {
                 .orElse(null);
         BizAssertions.assertNotNull(sealPerson, "印章人员不存在");
         //noinspection DataFlowIssue
-        BizAssertions.assertTrue(sealPerson.getIsAuthorized().isNo(), "请先取消授权再删除");
+        BizAssertions.assertTrue(!sealPerson.isAuthorized(), "请先取消授权再删除");
         essSealPersonDao.removeById(sealPerson.getId());
         log.info("remove seal person: {}", sealPerson);
     }
diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/QueryService.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/QueryService.java
index 1f0b8f9b..1e45e8e0 100644
--- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/QueryService.java
+++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/QueryService.java
@@ -123,7 +123,7 @@ public class QueryService {
                         continue;
                     EssSealPersonInfo sealPersonInfo = BeanMapper.copyBean(sealPerson, EssSealPersonInfo.class);
                     sealPersonInfo.setSuperAdmin(org.isSuperAdmin(sealPerson.getPersonId()));
-                    sealPersonInfo.setSealAuthorized(sealPerson.getIsAuthorized().isYes());
+                    sealPersonInfo.setSealAuthorized(sealPerson.isAuthorized());
                     sealPersonInfo.setPersonAuthorized(essPerson.isAuthorized());
                     sealPersonInfo.setAuthorizeTimeMs(sealPerson.getAuthorizeTime() == null
                             ? null : sealPerson.getAuthorizeTime().getTime());
@@ -160,7 +160,7 @@ public class QueryService {
                 continue;
             EssSealPersonInfo sealPersonInfo = BeanMapper.copyBean(sealPerson, EssSealPersonInfo.class);
             sealPersonInfo.setSuperAdmin(org.isSuperAdmin(sealPerson.getPersonId()));
-            sealPersonInfo.setSealAuthorized(sealPerson.getIsAuthorized().isYes());
+            sealPersonInfo.setSealAuthorized(sealPerson.isAuthorized());
             sealPersonInfo.setPersonAuthorized(essPerson.isAuthorized());
             sealPersonInfo.setAuthorizeTimeMs(sealPerson.getAuthorizeTime() == null
                     ? null : sealPerson.getAuthorizeTime().getTime());