优化结算模块代码质量和可读性

- 使用 Objects.isNull 和 Objects.nonNull 替换直接 null 判断,提高代码可读性和安全性
This commit is contained in:
syruan 2025-08-14 11:21:00 +08:00
parent 193b71a798
commit bd2062e4b8
1 changed files with 5 additions and 5 deletions

View File

@ -483,7 +483,7 @@ public class SltAgreementInfoServiceImpl implements ISltAgreementInfoService {
} }
} }
} }
return 1; return GlobalConstants.INT_1;
} catch (Exception e) { } catch (Exception e) {
throw new ServiceException("错误:" + e.getMessage()); throw new ServiceException("错误:" + e.getMessage());
} }
@ -500,18 +500,18 @@ public class SltAgreementInfoServiceImpl implements ISltAgreementInfoService {
// 去业务配置表查询当前登陆用户是否有权限 // 去业务配置表查询当前登陆用户是否有权限
BmConfig equipmentConfigUsers = bmConfigMapper.selectBmConfigByItemName(EQUIPMENT_COST_USERS); BmConfig equipmentConfigUsers = bmConfigMapper.selectBmConfigByItemName(EQUIPMENT_COST_USERS);
BmConfig safetyEquipmentConfigUsers = bmConfigMapper.selectBmConfigByItemName(SAFETY_EQUIPMENT_COST_USERS); BmConfig safetyEquipmentConfigUsers = bmConfigMapper.selectBmConfigByItemName(SAFETY_EQUIPMENT_COST_USERS);
if ((equipmentConfigUsers == null || equipmentConfigUsers.getItemValue() == null) if ((Objects.isNull(equipmentConfigUsers) || equipmentConfigUsers.getItemValue() == null)
&& (safetyEquipmentConfigUsers == null || safetyEquipmentConfigUsers.getItemValue() == null)) && (Objects.isNull(safetyEquipmentConfigUsers) || safetyEquipmentConfigUsers.getItemValue() == null))
{ {
throw new ServiceException("结算业务人员未配置,无法进行系统结算!"); throw new ServiceException("结算业务人员未配置,无法进行系统结算!");
} }
if (equipmentConfigUsers != null && equipmentConfigUsers.getItemValue() != null) { if (Objects.nonNull(equipmentConfigUsers) && equipmentConfigUsers.getItemValue() != null) {
boolean isContains = containsExactValue(equipmentConfigUsers.getItemValue(), String.valueOf(theLoginUserId)); boolean isContains = containsExactValue(equipmentConfigUsers.getItemValue(), String.valueOf(theLoginUserId));
if (isContains) { if (isContains) {
return GlobalConstants.INT_1; 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)); boolean isContains = containsExactValue(safetyEquipmentConfigUsers.getItemValue(), String.valueOf(theLoginUserId));
if (isContains) { if (isContains) {
return GlobalConstants.INT_2; return GlobalConstants.INT_2;