diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssOrgDao.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssOrgDao.java index fd48251f..42b81b15 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssOrgDao.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssOrgDao.java @@ -24,6 +24,10 @@ public class EssOrgDao extends ServiceImpl { return lambdaQuery().in(EssOrg::getOuId, ouIds).list(); } + public Optional find(Long ouId) { + return find(ouId, false); + } + public Optional find(Long ouId, boolean forUpdate) { return lambdaQuery() .eq(EssOrg::getOuId, ouId) diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssSealPersonDao.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssSealPersonDao.java index 54e192b8..4771e3e4 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssSealPersonDao.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssSealPersonDao.java @@ -59,6 +59,10 @@ public class EssSealPersonDao extends ServiceImpl find(String essSealId, Long personId) { + return find(essSealId, personId, false); + } + public Optional find(String essSealId, Long personId, boolean forUpdate) { return lambdaQuery() .eq(EssSealPerson::getEssSealId, essSealId) 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 e605cfc4..8e44ea59 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 @@ -78,7 +78,7 @@ public class EssService { EssSeal seal = essSealDao.findByEssSealId(request.getEssSealId()).orElse(null); BizAssertions.assertNotNull(seal, "印章不存在: {}", request.getEssSealId()); EssSealPerson sealPerson = essSealPersonDao - .find(request.getEssSealId(), request.getPersonId(), false) + .find(request.getEssSealId(), request.getPersonId()) .orElse(null); BizAssertions.assertNotNull(sealPerson, "印章人员不存在: {}", request.getEssSealId(), request.getPersonId()); return new SealAndPerson(seal, sealPerson); 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 46ea2f32..d3313b3b 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 @@ -93,7 +93,7 @@ public class OrgManager { } Optional findSuperAdmin(Long ouId) { - EssOrg org = essOrgDao.find(ouId, true).orElse(null); + EssOrg org = essOrgDao.find(ouId).orElse(null); BizAssertions.assertNotNull(org, "单位不存在: {}", ouId); //noinspection DataFlowIssue if (org.getSuperAdminPersonId() <= 0L) 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 24703432..49ccf0f9 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 @@ -15,8 +15,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; /** @@ -34,7 +32,7 @@ public class PrivateController { @SuppressWarnings("DataFlowIssue") @PostMapping("/private/ess/getOrgUsers") public ApiResult getOrgUsers(@RequestParam("ouId") Long ouId) { - EssOrg org = essOrgDao.find(ouId, false).orElse(null); + EssOrg org = essOrgDao.find(ouId).orElse(null); BizAssertions.assertNotNull(org, "电子签单位不存在"); EssPerson superAdmin = orgManager.getSuperAdminOrThrow(ouId); HashMap staffs = new HashMap<>();