From bd2062e4b8e45c86569a338b261c04dc12b3fa10 Mon Sep 17 00:00:00 2001 From: syruan <15555146157@163.com> Date: Thu, 14 Aug 2025 11:21:00 +0800 Subject: [PATCH] =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E8=B4=A8=E9=87=8F=E5=92=8C?= =?UTF-8?q?=E5=8F=AF=E8=AF=BB=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 使用 Objects.isNull 和 Objects.nonNull 替换直接 null 判断，提高代码可读性和安全性 --- .../service/impl/SltAgreementInfoServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementInfoServiceImpl.java index 114ced1a..a336c2bf 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementInfoServiceImpl.java @@ -483,7 +483,7 @@ public class SltAgreementInfoServiceImpl implements ISltAgreementInfoService { } } } - return 1; + return GlobalConstants.INT_1; } catch (Exception e) { throw new ServiceException("错误:" + e.getMessage()); } @@ -500,18 +500,18 @@ public class SltAgreementInfoServiceImpl implements ISltAgreementInfoService { // 去业务配置表查询当前登陆用户是否有权限 BmConfig equipmentConfigUsers = bmConfigMapper.selectBmConfigByItemName(EQUIPMENT_COST_USERS); BmConfig safetyEquipmentConfigUsers = bmConfigMapper.selectBmConfigByItemName(SAFETY_EQUIPMENT_COST_USERS); - if ((equipmentConfigUsers == null || equipmentConfigUsers.getItemValue() == null) - && (safetyEquipmentConfigUsers == null || safetyEquipmentConfigUsers.getItemValue() == null)) + if ((Objects.isNull(equipmentConfigUsers) || equipmentConfigUsers.getItemValue() == null) + && (Objects.isNull(safetyEquipmentConfigUsers) || safetyEquipmentConfigUsers.getItemValue() == null)) { throw new ServiceException("结算业务人员未配置，无法进行系统结算!"); } - if (equipmentConfigUsers != null && equipmentConfigUsers.getItemValue() != null) { + if (Objects.nonNull(equipmentConfigUsers) && equipmentConfigUsers.getItemValue() != null) { boolean isContains = containsExactValue(equipmentConfigUsers.getItemValue(), String.valueOf(theLoginUserId)); if (isContains) { return GlobalConstants.INT_1; } } - if (safetyEquipmentConfigUsers != null && safetyEquipmentConfigUsers.getItemValue() != null) { + if (Objects.nonNull(safetyEquipmentConfigUsers) && Objects.nonNull(safetyEquipmentConfigUsers.getItemValue())) { boolean isContains = containsExactValue(safetyEquipmentConfigUsers.getItemValue(), String.valueOf(theLoginUserId)); if (isContains) { return GlobalConstants.INT_2;