Merge remote-tracking branch 'origin/v3' into v3

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/mapper/UserMapper.java

@@ -70,6 +70,7 @@ public interface UserMapper
      * @return 用户对象信息
      */
     User selectUserByLoginName(String userName);
+    User selectUserByCertificateNumber(String certificateNumber);
     User selectUserByUserPhone(String phone);
 
     /**

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());

lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml

@@ -310,6 +310,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}