From a4aa60c5405cfbe087a93119600325af11f84347 Mon Sep 17 00:00:00 2001
From: zhangyue <zhangyue>
Date: Sat, 22 Nov 2025 18:00:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=90=8D=E7=A7=B0=E6=9F=A5?=
 =?UTF-8?q?=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CorpInfoRepositoryImpl.java          |  5 +++-
 .../repository/impl/UserRepositoryImpl.java   |  1 +
 .../src/main/resources/mapper/UserMapper.xml  | 24 +++++++++++--------
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java
index be07c91..9e2b5b6 100644
--- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java
+++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java
@@ -145,7 +145,10 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl<CorpInfoMapper, C
     public Long checkCorpName(Map<String, Object> parmas) {
         QueryWrapper<CorpInfoDO> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("corp_name", parmas.get("corpName"));
-        queryWrapper.ne("id", parmas.get("id"));
+        if(!ObjectUtil.isEmpty(parmas.get("id"))){
+            queryWrapper.ne("id", parmas.get("id"));
+        }
+
         return corpInfoMapper.selectCount(queryWrapper);
     }
 
diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
index f078f72..d9d019f 100644
--- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
+++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
@@ -1,5 +1,6 @@
 package com.zcloud.basic.info.persistence.repository.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.cola.dto.MultiResponse;
 import com.alibaba.cola.dto.PageResponse;
 import com.alibaba.cola.dto.Response;
diff --git a/web-infrastructure/src/main/resources/mapper/UserMapper.xml b/web-infrastructure/src/main/resources/mapper/UserMapper.xml
index 5dffd95..e21a31e 100644
--- a/web-infrastructure/src/main/resources/mapper/UserMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/UserMapper.xml
@@ -252,16 +252,20 @@
     <select id="countUser" resultType="Integer">
         select count(1)
         from user
-        where id != #{params.id}
-        <if test="params.username != null">
-            and username = #{params.username}
-        </if>
-        <if test="params.userIdCard != null">
-            and user_id_card = #{params.userIdCard}
-        </if>
-        <if test="params.phone != null">
-            and phone = #{params.phone}
-        </if>
+        <where>
+            <if test="params.id != null">
+                and id != #{params.id}
+            </if>
+            <if test="params.username != null">
+                and username = #{params.username}
+            </if>
+            <if test="params.userIdCard != null">
+                and user_id_card = #{params.userIdCard}
+            </if>
+            <if test="params.phone != null">
+                and phone = #{params.phone}
+            </if>
+        </where>
     </select>
 
 </mapper>