From 9d6e49c94efc41e9a4077efe53049a024e4f6180 Mon Sep 17 00:00:00 2001
From: Sol <bgasolyang@gmail.com>
Date: Fri, 16 May 2025 22:56:07 +0800
Subject: [PATCH] fix(common-base-web): Fix null pointer exception in findById
 method

---
 .../com/bgasol/common/core/base/service/BaseService.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cloud/common/common-base-web/src/main/java/com/bgasol/common/core/base/service/BaseService.java b/cloud/common/common-base-web/src/main/java/com/bgasol/common/core/base/service/BaseService.java
index 07219b9..bced6e7 100644
--- a/cloud/common/common-base-web/src/main/java/com/bgasol/common/core/base/service/BaseService.java
+++ b/cloud/common/common-base-web/src/main/java/com/bgasol/common/core/base/service/BaseService.java
@@ -14,6 +14,7 @@ import jakarta.persistence.JoinTable;
 import jakarta.persistence.Table;
 import jakarta.persistence.Transient;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.reflect.FieldUtils;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -232,7 +233,9 @@ public abstract class BaseService<ENTITY extends BaseEntity, PAGE_DTO extends Ba
     @Transactional(readOnly = true)
     public ENTITY findById(String id) {
         ENTITY entity = commonBaseMapper().selectById(id);
-        this.findOtherTable(entity);
+        if (ObjectUtils.isNotEmpty(entity)) {
+            this.findOtherTable(entity);
+        }
         return entity;
     }