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 a3adb586..82d364c8 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
@@ -98,13 +98,17 @@ public class OrgManager {
 	}
 
 	Optional<EssPerson> findSuperAdmin(Long ouId) {
-		EssOrg org = essOrgDao.findOrNull(ouId);
+		EssOrg org = findOrgOrNull(ouId);
 		BizAssertions.assertNotNull(org, "单位还未认证. 单位id={}", ouId);
 		if (org.getSuperAdminPersonId() <= 0L)
 			return Optional.empty();
 		return Optional.ofNullable(essPersonDao.findOrNull(ouId, org.getSuperAdminPersonId()));
 	}
 
+	public EssOrg findOrgOrNull(Long ouId) {
+		return essOrgDao.findOrNull(ouId);
+	}
+
 	// !! seal
 
 	@BizTransactional
@@ -188,7 +192,7 @@ public class OrgManager {
 	}
 
 	public void ensureOrgAuthorized(Long ouId, String message) {
-		EssOrg org = essOrgDao.findOrNull(ouId);
+		EssOrg org = findOrgOrNull(ouId);
 		BizAssertions.assertTrue(org != null && org.isAuthorized(), message);
 	}
 }
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 ccf18251..4a054fa3 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
@@ -1,6 +1,22 @@
 
 package cn.axzo.nanopart.ess.server.ess;
 
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.toSet;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.BiConsumer;
+
+import org.springframework.stereotype.Service;
+
+import com.google.common.collect.Lists;
+
 import cn.axzo.basics.common.BeanMapper;
 import cn.axzo.basics.profiles.dto.basic.PersonProfileDto;
 import cn.axzo.nanopart.ess.api.domain.EssOrgAndSealInfo;
@@ -29,21 +45,7 @@ import cn.axzo.nanopart.ess.server.ess.domain.EssPersons;
 import cn.axzo.nanopart.ess.server.ess.support.EssSupport;
 import cn.axzo.nanopart.ess.server.ess.support.PersonProfiles;
 import cn.axzo.nanopart.ess.server.utils.BizAssertions;
-import com.google.common.collect.Lists;
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.BiConsumer;
-
-import static java.util.stream.Collectors.groupingBy;
-import static java.util.stream.Collectors.toSet;
 
 /**
  * @author yanglin
diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/controller/PrivateController.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/controller/PrivateController.java
index ae48c71c..d391e7df 100644
--- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/controller/PrivateController.java
+++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/controller/PrivateController.java
@@ -1,22 +1,23 @@
 
 package cn.axzo.nanopart.ess.server.ess.controller;
 
+import java.util.HashMap;
+
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.tencentcloudapi.essbasic.v20210526.models.ChannelDescribeEmployeesResponse;
+import com.tencentcloudapi.essbasic.v20210526.models.Staff;
+
 import cn.axzo.framework.domain.web.result.ApiResult;
-import cn.axzo.nanopart.ess.server.dao.EssOrgDao;
 import cn.axzo.nanopart.ess.server.entity.EssOrg;
 import cn.axzo.nanopart.ess.server.entity.EssPerson;
 import cn.axzo.nanopart.ess.server.ess.EssClient;
 import cn.axzo.nanopart.ess.server.ess.OrgManager;
 import cn.axzo.nanopart.ess.server.utils.BizAssertions;
-import com.tencentcloudapi.essbasic.v20210526.models.ChannelDescribeEmployeesResponse;
-import com.tencentcloudapi.essbasic.v20210526.models.Staff;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.HashMap;
 
 /**
  * @author yanglin
@@ -28,11 +29,10 @@ public class PrivateController {
 
 	private final OrgManager orgManager;
 	private final EssClient essClient;
-	private final EssOrgDao essOrgDao;
 
 	@PostMapping("/private/ess/getOrgPersons")
 	public ApiResult<?> getOrgPersons(@RequestParam("ouId") Long ouId) {
-		EssOrg org = essOrgDao.findOrNull(ouId);
+		EssOrg org = orgManager.findOrgOrNull(ouId);
 		BizAssertions.assertNotNull(org, "电子签单位不存在");
 		EssPerson superAdmin = orgManager.getSuperAdminOrThrow(ouId);
 		HashMap<String, Staff> staffs = new HashMap<>();
diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/mq/PersonResignHandler.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/mq/PersonResignHandler.java
index 4d65513a..a79215c5 100644
--- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/mq/PersonResignHandler.java
+++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/mq/PersonResignHandler.java
@@ -12,7 +12,6 @@ import cn.axzo.framework.rocketmq.Event;
 import cn.axzo.framework.rocketmq.EventConsumer;
 import cn.axzo.framework.rocketmq.EventHandler;
 import cn.axzo.maokai.api.domain.event.user.OrgUserStatusChangedEvent;
-import cn.axzo.nanopart.ess.server.dao.EssOrgDao;
 import cn.axzo.nanopart.ess.server.dao.EssPersonDao;
 import cn.axzo.nanopart.ess.server.entity.EssOrg;
 import cn.axzo.nanopart.ess.server.entity.EssPerson;
@@ -32,7 +31,6 @@ public class PersonResignHandler implements EventHandler, InitializingBean {
 	private final EventConsumer eventConsumer;
 	private final EssClient essClient;
 	private final OrgManager orgManager;
-	private final EssOrgDao essOrgDao;
 	private final EssPersonDao essPersonDao;
 
 	@Override
@@ -46,7 +44,7 @@ public class PersonResignHandler implements EventHandler, InitializingBean {
 	}
 
 	private void trySetPersonResigned(OrgUserStatusChangedEvent event) {
-		EssOrg org = essOrgDao.findOrNull(event.getOuId());
+		EssOrg org = orgManager.findOrgOrNull(event.getOuId());
 		if (org == null) {
 			log.info("未找到单位: {}", JSON.toJSONString(event));
 			return;