#

Junjie

昨天 bd6b518aae61608ddc2d82b43ccc283dc95b9c54

 src/main/resources/mapper/UserMapper.xml

@@ -12,16 +12,24 @@
        <result column="mfa_allow" property="mfaAllow" />
        <result column="mfa_enabled" property="mfaEnabled" />
        <result column="mfa_bound_time" property="mfaBoundTime" />
        <result column="passkey_name" property="passkeyName" />
        <result column="passkey_bound_time" property="passkeyBoundTime" />
        <result column="passkey_last_used_time" property="passkeyLastUsedTime" />
        <result column="role_id" property="roleId" />
        <result column="create_time" property="createTime" />
        <result column="status" property="status" />
    </resultMap>

    <resultMap id="MfaResultMap" type="com.zy.system.entity.User" extends="BaseResultMap">
    <resultMap id="SecurityResultMap" type="com.zy.system.entity.User" extends="BaseResultMap">
        <result column="mfa_secret" property="mfaSecret" />
        <result column="passkey_credential_id" property="passkeyCredentialId" />
        <result column="passkey_public_key" property="passkeyPublicKey" />
        <result column="passkey_algorithm" property="passkeyAlgorithm" />
        <result column="passkey_sign_count" property="passkeySignCount" />
        <result column="passkey_transports" property="passkeyTransports" />
    </resultMap>

    <select id="selectByMobileWithMfa" resultMap="MfaResultMap">
    <select id="selectByMobileWithSecurity" resultMap="SecurityResultMap">
        select
            id,
            host_id,
@@ -32,6 +40,14 @@
            mfa_enabled,
            mfa_secret,
            mfa_bound_time,
            passkey_name,
            passkey_credential_id,
            passkey_public_key,
            passkey_algorithm,
            passkey_sign_count,
            passkey_transports,
            passkey_bound_time,
            passkey_last_used_time,
            role_id,
            create_time,
            status
@@ -40,7 +56,7 @@
        limit 1
    </select>

    <select id="selectByIdWithMfa" resultMap="MfaResultMap">
    <select id="selectByIdWithSecurity" resultMap="SecurityResultMap">
        select
            id,
            host_id,
@@ -51,6 +67,14 @@
            mfa_enabled,
            mfa_secret,
            mfa_bound_time,
            passkey_name,
            passkey_credential_id,
            passkey_public_key,
            passkey_algorithm,
            passkey_sign_count,
            passkey_transports,
            passkey_bound_time,
            passkey_last_used_time,
            role_id,
            create_time,
            status
@@ -58,4 +82,31 @@
        where id = #{id}
        limit 1
    </select>

    <select id="selectByPasskeyCredentialId" resultMap="SecurityResultMap">
        select
            id,
            host_id,
            username,
            mobile,
            password,
            mfa_allow,
            mfa_enabled,
            mfa_secret,
            mfa_bound_time,
            passkey_name,
            passkey_credential_id,
            passkey_public_key,
            passkey_algorithm,
            passkey_sign_count,
            passkey_transports,
            passkey_bound_time,
            passkey_last_used_time,
            role_id,
            create_time,
            status
        from sys_user
        where passkey_credential_id = #{credentialId}
        limit 1
    </select>
</mapper>