From cc932426aeb10719db7977e7643f91106880e10a Mon Sep 17 00:00:00 2001 From: liuyang Date: Mon, 20 Jan 2025 14:28:48 +0800 Subject: [PATCH] =?UTF-8?q?feat:[REQ-3488]=20=E4=BF=AE=E6=94=B9sonar?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CooperateShipFoundationServiceImpl.java | 1 - .../impl/CooperateShipServiceImpl.java | 30 ++++++++++--------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/cooperateship/foundation/impl/CooperateShipFoundationServiceImpl.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/cooperateship/foundation/impl/CooperateShipFoundationServiceImpl.java index a9ebb41..1944cc0 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/cooperateship/foundation/impl/CooperateShipFoundationServiceImpl.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/cooperateship/foundation/impl/CooperateShipFoundationServiceImpl.java @@ -206,7 +206,6 @@ public class CooperateShipFoundationServiceImpl implements CooperateShipFoundati .updateBy(creator.getOperatorId()) .path(Optional.ofNullable(parentCooperateShip).map(SaasCooperateShip::getPath).orElse("")) .build(); - // 保存协同关系 SaasCooperateShip savedCooperateShip = cooperateShipUpsertRepository.create(cooperateShip); diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/cooperateship/service/impl/CooperateShipServiceImpl.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/cooperateship/service/impl/CooperateShipServiceImpl.java index 9f24183..a217456 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/cooperateship/service/impl/CooperateShipServiceImpl.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/cooperateship/service/impl/CooperateShipServiceImpl.java @@ -89,7 +89,7 @@ public class CooperateShipServiceImpl implements CooperateShipService { // 如果personId有值, 则先将nodeUser查询来, 作为筛选条件 if (isFilterCurrentNodeByPerson) { List nodeUsers = nodeUserQueryRepository.list(NodeUserQueryRepository.ListReq.builder() - .selects(Arrays.asList(OrganizationalNodeUser::getTopNodeId)) + .selects(Collections.singletonList(OrganizationalNodeUser::getTopNodeId)) .personId(req.getFilterByPersonId()) .includeDeleted(req.getFilterIncludeExitPerson()) .build()); @@ -185,9 +185,9 @@ public class CooperateShipServiceImpl implements CooperateShipService { /** * 校验空值 * - * @param suppliers + * @param suppliers 需要校验的字段 */ - private final void checkAllNullValue(Supplier... suppliers) { + private void checkAllNullValue(Supplier... suppliers) { // 入参空数组,则不做任何处理 if (ArrayUtil.isEmpty(suppliers)) { return; @@ -197,18 +197,20 @@ public class CooperateShipServiceImpl implements CooperateShipService { for (Supplier supplier : suppliers) { Object value = supplier.get(); - if (value != null) { - if (value instanceof Collection) { - if (CollUtil.isNotEmpty((Collection) value)) { - isAllNull = false; - } - } + if (value == null) { + continue; + } - if (value instanceof Long) { - Long longValue = Convert.toLong(value, 0L); - if (longValue > 0) { - isAllNull = false; - } + // 集合校验 + if (value instanceof Collection && CollUtil.isNotEmpty((Collection) value)) { + isAllNull = false; + } + + // Long类型校验 + if (value instanceof Long) { + Long longValue = Convert.toLong(value, 0L); + if (longValue > 0) { + isAllNull = false; } } }