From 46d58159c718782f91c74266efccbd52ba88b7c8 Mon Sep 17 00:00:00 2001
From: niushuai233 <shuai.niu@foxmail.com>
Date: Tue, 3 Jan 2023 22:53:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20id=E9=9D=9E=E7=A9=BA=20=E7=BB=84?=
 =?UTF-8?q?=E8=A3=85id=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bastionserver/common/base/controller/BaseController.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/cc/niushuai/bastionserver/common/base/controller/BaseController.java b/src/main/java/cc/niushuai/bastionserver/common/base/controller/BaseController.java
index b634d4b..2b859fc 100644
--- a/src/main/java/cc/niushuai/bastionserver/common/base/controller/BaseController.java
+++ b/src/main/java/cc/niushuai/bastionserver/common/base/controller/BaseController.java
@@ -244,7 +244,10 @@ public class BaseController<T, S extends IService<T>> {
             wrapper.eq(fn, fn.apply(obj));
         }
 
-        wrapper.ne(null != id, id, id.apply(obj));
+        if (null != id) {
+            // id非空 组装id条件
+            wrapper.ne(id, id.apply(obj));
+        }
 
         boolean exists = service.getBaseMapper().exists(wrapper);
         if (exists) {