From f5fbc6a8bdb3ecf5c4c80e4012223323470db681 Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Tue, 23 Dec 2025 10:35:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=B2=97=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zcloud/basic/info/command/UserAddExe.java     |  3 +++
 .../info/persistence/repository/UserRepository.java   |  2 ++
 .../repository/impl/UserRepositoryImpl.java           | 11 +++++++++++
 .../src/main/resources/mapper/UserMapper.xml          |  5 ++++-
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
index 7965482f..fb0a7a07 100644
--- a/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
+++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
@@ -2,6 +2,7 @@ package com.zcloud.basic.info.command;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.RandomUtil;
+import com.alibaba.cola.dto.Response;
 import com.alibaba.cola.dto.SingleResponse;
 import com.alibaba.cola.exception.BizException;
 import com.jjb.saas.config.client.dicttree.facade.ConfDictTreeFacade;
@@ -160,6 +161,8 @@ public class UserAddExe {
         if(userDO == null){
             throw new BizException("用户不存在");
         }
+        userRepository.checkUserIdCard(cmd.getId(),cmd.getUserIdCard());
+
         if(userDO.getFlowFlag()!=null && !userDO.getFlowFlag().equals(cmd.getFlowFlag())){
             // 已完善,与旧数据对比
             List<UserCorpRecordDO> userCorpRecordDOList = userCorpRecordRepository.getInfoListByUserId(cmd.getId());
diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java
index 603dc465..08ee7c32 100644
--- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java
+++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java
@@ -80,5 +80,7 @@ public interface UserRepository extends BaseRepository<UserDO> {
     UserDO getByPhone(String phone);
 
     UserDO getByPhoneAndIdCard(String phone, String idCardNumber);
+
+    void checkUserIdCard(@NotNull(message = "主键id不能为空") Long id, String userIdCard);
 }
 
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 303d8cac..ed429f69 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
@@ -509,5 +509,16 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
         queryWrapper.eq("user_id_card", idCardNumber);
         return getOne(queryWrapper);
     }
+
+    @Override
+    public void checkUserIdCard(Long id, String userIdCard) {
+        Map<String, Object> verifyParam = new HashMap<>();
+        verifyParam.put("userIdCard", userIdCard);
+        verifyParam.put("id", id);
+        Integer count = userMapper.countUser(verifyParam);
+        if (count > 0) {
+            throw new BizException("身份证号已经存在，请联系管理员");
+        }
+    }
 }
 
diff --git a/web-infrastructure/src/main/resources/mapper/UserMapper.xml b/web-infrastructure/src/main/resources/mapper/UserMapper.xml
index 3e28abc4..263bbeff 100644
--- a/web-infrastructure/src/main/resources/mapper/UserMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/UserMapper.xml
@@ -168,7 +168,10 @@
     <select id="getInfoById" resultType="com.zcloud.basic.info.persistence.dataobject.UserDO">
         select
         d.name as department_name,
-        p.post_name,
+        CASE
+        WHEN c.type IN (1, 2, 3) THEN u.post_name
+        ELSE p.post_name
+        END AS post_name,
         u.id,
         u.user_id,
         u.username,