From 27767939a5d0acf24fa6c0bc15e6af363edce80b Mon Sep 17 00:00:00 2001
From: yanglin <yanglin@axzo.cn>
Date: Mon, 3 Mar 2025 09:32:15 +0800
Subject: [PATCH] =?UTF-8?q?REQ-3581:=20=E5=8D=B0=E7=AB=A0=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83=E4=BA=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nanopart/ess/server/dao/EssContractDao.java  | 11 ++++++++---
 .../axzo/nanopart/ess/server/dao/EssOrgDao.java  |  9 +++++++--
 .../axzo/nanopart/ess/server/dao/EssSealDao.java |  4 +++-
 .../ess/server/dao/EssSealPersonDao.java         | 16 ++++++++++++----
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssContractDao.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssContractDao.java
index 6702205a..aaca309b 100644
--- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssContractDao.java
+++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssContractDao.java
@@ -23,8 +23,10 @@ import java.util.Optional;
 public class EssContractDao extends ServiceImpl<EssContractMapper, EssContract> {
 
 	public Optional<EssContract> findByIdempotentCode(String appCode, String idempotentCode) {
-		return lambdaQuery().eq(EssContract::getAppCode, appCode).eq(EssContract::getIdempotentCode,
-			idempotentCode).oneOpt();
+		return lambdaQuery() //
+				.eq(EssContract::getAppCode, appCode) //
+				.eq(EssContract::getIdempotentCode, idempotentCode) //
+				.oneOpt();
 	}
 
 	public EssContract getOrThrow(String essContractId) {
@@ -42,7 +44,10 @@ public class EssContractDao extends ServiceImpl<EssContractMapper, EssContract>
 	}
 
 	private Optional<EssContract> find(String essContractId, boolean forUpdate) {
-		return lambdaQuery().eq(EssContract::getEssContractId, essContractId).last(forUpdate, "FOR UPDATE").oneOpt();
+		return lambdaQuery() //
+				.eq(EssContract::getEssContractId, essContractId) //
+				.last(forUpdate, "FOR UPDATE") //
+				.oneOpt();
 	}
 
 	public void setEssContractCreated(Long id, String flowId, List<String> essFileIds, List<Approver> approvers) {
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 389e7c2c..4be7265f 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
@@ -25,7 +25,9 @@ public class EssOrgDao extends ServiceImpl<EssOrgMapper, EssOrg> {
 	public List<EssOrg> getByOuIds(Collection<Long> ouIds) {
 		if (CollectionUtils.isEmpty(ouIds))
 			return Collections.emptyList();
-		return lambdaQuery().in(EssOrg::getOuId, ouIds).list();
+		return lambdaQuery() //
+				.in(EssOrg::getOuId, ouIds) //
+				.list();
 	}
 
 	public EssOrg findOrNull(Long ouId) {
@@ -37,7 +39,10 @@ public class EssOrgDao extends ServiceImpl<EssOrgMapper, EssOrg> {
 	}
 
 	private Optional<EssOrg> find(Long ouId, boolean forUpdate) {
-		return lambdaQuery().eq(EssOrg::getOuId, ouId).last(forUpdate, "FOR UPDATE").oneOpt();
+		return lambdaQuery() //
+				.eq(EssOrg::getOuId, ouId) //
+				.last(forUpdate, "FOR UPDATE") //
+				.oneOpt();
 	}
 
 	public void setOrgAuthorized(OrgPerson superAdmin) {
diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssSealDao.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssSealDao.java
index 2156b888..730fdb60 100644
--- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssSealDao.java
+++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssSealDao.java
@@ -16,7 +16,9 @@ import java.util.Optional;
 public class EssSealDao extends ServiceImpl<EssSealMapper, EssSeal> {
 
 	public Optional<EssSeal> findByEssSealId(String essSealId) {
-		return lambdaQuery().eq(EssSeal::getEssSealId, essSealId).oneOpt();
+		return lambdaQuery() //
+				.eq(EssSeal::getEssSealId, essSealId) //
+				.oneOpt();
 	}
 
 	public void updateState(String essSealId, EssSealState state) {
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 bbebe005..69c5a069 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
@@ -43,16 +43,24 @@ public class EssSealPersonDao extends ServiceImpl<EssSealPersonMapper, EssSealPe
 	}
 
 	public Optional<EssSealPerson> find(String essSealId, Long personId, boolean forUpdate) {
-		return lambdaQuery().eq(EssSealPerson::getEssSealId, essSealId).eq(EssSealPerson::getPersonId, personId).last(
-			forUpdate, "FOR UPDATE").oneOpt();
+		return lambdaQuery() //
+				.eq(EssSealPerson::getEssSealId, essSealId) //
+				.eq(EssSealPerson::getPersonId, personId) //
+				.last(forUpdate, "FOR UPDATE") //
+				.oneOpt();
 	}
 
 	public List<EssSealPerson> getByPersonId(Long ouId, Long personId) {
-		return lambdaQuery().eq(EssSealPerson::getOuId, ouId).eq(EssSealPerson::getPersonId, personId).list();
+		return lambdaQuery() //
+				.eq(EssSealPerson::getOuId, ouId) //
+				.eq(EssSealPerson::getPersonId, personId) //
+				.list();
 	}
 
 	public List<EssSealPerson> get(String essSealId) {
-		return lambdaQuery().eq(EssSealPerson::getEssSealId, essSealId).list();
+		return lambdaQuery() //
+				.eq(EssSealPerson::getEssSealId, essSealId) //
+				.list();
 	}
 
 }