From 61c64b239d76eaf1663dddcaf8bc6d5e6c66b746 Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Wed, 11 Sep 2024 21:12:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8C=E6=AD=A5=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E7=9A=84=E6=97=B6=E5=80=99=E4=BC=98=E5=85=88=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E8=BA=AB=E4=BB=BD=E8=AF=81,=20=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=9C=A8=E5=88=A4=E6=96=AD=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zdxt/auth/project/system/user/mapper/UserMapper.java   | 1 +
 .../auth/project/system/user/service/UserServiceImpl.java  | 7 ++++++-
 .../src/main/resources/mapper/system/UserMapper.xml        | 6 ++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/mapper/UserMapper.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/mapper/UserMapper.java
index c5e130ed..10be61ed 100644
--- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/mapper/UserMapper.java
+++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/mapper/UserMapper.java
@@ -62,6 +62,7 @@ public interface UserMapper
      * @return 用户对象信息
      */
     User selectUserByLoginName(String userName);
+    User selectUserByCertificateNumber(String certificateNumber);
     User selectUserByUserPhone(String phone);
 
     /**
diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java
index b1d64795..0a46fafc 100644
--- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java
+++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java
@@ -745,7 +745,12 @@ public class UserServiceImpl implements IUserService {
                 //新增用户默认不删除标记
                 user.setDelFlag("0");
 
-                User uniqueUser = userMapper.selectUserByLoginName(jsonObject.getString("username"));
+                User uniqueUser = null;
+                if (StringUtils.isNotEmpty(units)) {
+                    uniqueUser = userMapper.selectUserByCertificateNumber(units);
+                } else {
+                    uniqueUser = userMapper.selectUserByLoginName(jsonObject.getString("username"));
+                }
                 if (null != uniqueUser && uniqueUser.getUserId() != null) {
                     // 跟新数据库
                     user.setUserId(uniqueUser.getUserId());
diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml
index 8369ee26..2034015e 100644
--- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml
+++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml
@@ -264,6 +264,12 @@
         and u.del_flag = 0
     </select>
 
+    <select id="selectUserByCertificateNumber" parameterType="String" resultMap="UserResult">
+        <include refid="selectUserVo"/>
+        where u.certificateNumber = #{certificateNumber}
+        and u.del_flag = 0
+    </select>
+
     <select id="selectUserByUserPhone" parameterType="String" resultMap="UserResult">
         <include refid="selectUserVo"/>
         where u.phonenumber = #{phone}