Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-30 730443b70de88d328ffa275f51f69280fda979e4

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

@@ -15,22 +15,14 @@
             `user` u
        WHERE e.`id` = u.`enterprise_id`
          AND u.id = #{userId}
          and type = 1
    </select>

    <resultMap id="PagePersonnelVoMap" type="com.yuanchu.limslaboratory.pojo.vo.PagePersonnelVo">
        <result property="id" column="id"/>
        <result property="username" column="username"/>
        <result property="roleName" column="roleName"/>
        <result property="createTime" column="create_time"/>
        <result property="age" column="age"/>
        <result property="phone" column="phone"/>
        <result property="email" column="email"/>
        <result property="jobState" column="job_state"/>
        <result property="department" column="department"/>
    </resultMap>
    <select id="getNewPersonnelPage" resultMap="PagePersonnelVoMap">
        SELECT u.`id`, u.`name` username, r.`name` roleName, u.`create_time`, u.`age`,
        u.`phone`, u.`email`, u.`job_state`, o.`department`

    <select id="getNewPersonnelPage" resultType="map">
        SELECT u.`id`, u.`name` username, r.`name` roleName, DATE_FORMAT(u.`create_time`, '%Y-%m-%d') createTime,
        u.`age`,
        u.`phone`, u.`email`, u.`job_state` jobState, o.`department`, u.`account`, o.`id` departmentId
        FROM `user` u
        LEFT JOIN role r
        ON u.`role_id` = r.`id` AND r.`state` = 1
@@ -43,6 +35,7 @@
        <if test="status != null">
            AND u.`job_state` in (#{status})
        </if>
        and type=1
        ORDER BY u.`create_time` DESC
    </select>

@@ -50,5 +43,6 @@
        select id, name
        from lims_laboratory.user
        where job_state!=0
        and type=1
    </select>
</mapper>