Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-22 f77a2eba10ce3f430d31a34790a8a1184c8069e6

 user-server/src/main/resources/mapper/UserMapper.xml

@@ -32,7 +32,7 @@
        IFNULL(u.`phone`, '---') phone, IFNULL(u.`email`, '---') email, u.`job_state`
        FROM `user` u, role r
        WHERE u.`role_id` = r.`id`
        <if test="name != null">
        <if test="name != null and name!=''">
            AND u.name = #{name}
        </if>
    </select>
@@ -40,5 +40,6 @@
    <select id="selectUser" resultType="Map">
        select id, name
        from lims_laboratory.user
        where job_state!=0
    </select>
</mapper>