Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-22 f77a2eba10ce3f430d31a34790a8a1184c8069e6

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

@@ -32,26 +32,14 @@
        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>

    <select id="selectUser" resultType="com.yuanchu.limslaboratory.pojo.User">
        select id,
               account,
               password,
               name,
               phone,
               email,
               age,
               job_state,
               info,
               create_time,
               update_time,
               version,
               role_id,
               enterprise_id
    <select id="selectUser" resultType="Map">
        select id, name
        from lims_laboratory.user
        where job_state!=0
    </select>
</mapper>