开发8-25人员管理剩余编辑功能

XiaoRuby

2023-08-25 b0b77110b22827d453e9a1580906b3f53add19f9

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

@@ -17,7 +17,7 @@
          AND u.id = #{userId}
    </select>

    <resultMap id="PagePersonnelVoMap" type="com.yuanchu.limslaboratory.vo.PagePersonnelVo">
    <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"/>
@@ -26,15 +26,24 @@
        <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`, IFNULL(u.`age`, '---') age,
        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 and name!=''">
            AND u.name = #{name}
        SELECT u.`id`, u.`name` username, r.`name` roleName, u.`create_time`, u.`age`,
        u.`phone`, u.`email`, u.`job_state`, o.`department`
        FROM `user` u
        LEFT JOIN role r
        ON u.`role_id` = r.`id` AND r.`state` = 1
        LEFT JOIN organizational o
        ON u.`organization_id` = o.`id` AND o.`state` = 1
        WHERE u.`state` = 1
        <if test="name != null and name != ''">
            AND u.`name` LIKE CONCAT('%',#{name}, '%')
        </if>
        <if test="status != null">
            AND u.`job_state` in (#{status})
        </if>
        ORDER BY u.`create_time` DESC
    </select>

    <select id="selectUser" resultType="Map">