部门bug修改

zhanghua

2022-10-17 6fae8bed3321996325927f5423d8df670a895aaa

部门bug修改

 ycl-common/src/main/java/com/ycl/dto/user/DepartUserDTO.java

@@ -19,4 +19,7 @@
    private Long userId;
    @ApiModelProperty(value = "用户名")
    private String username;

    @ApiModelProperty("是否为领导")
    private Boolean leader;
}

 ycl-common/src/main/java/com/ycl/entity/depart/DepartManager.java

@@ -59,7 +59,7 @@
     * 是否是领导
     */
    @TableField("is_leader")
    private Integer isLeader;
    private Boolean leader;


}

 ycl-common/src/main/resources/mapper/depart/DepartManagerMapper.xml

@@ -9,7 +9,7 @@
        <result column="depart_id" property="departId" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="is_leader" property="isLeader" />
        <result column="is_leader" property="leader" />
    </resultMap>

    <!-- 通用查询结果列 -->

 ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml

@@ -26,6 +26,7 @@
        <collection property="userInfoDTOS" javaType="ArrayList" ofType="com.ycl.dto.user.DepartUserDTO">
            <id column="user_id" property="userId"/>
            <result column="username" property="username"/>
            <result column="is_leader" property="leader" jdbcType="BOOLEAN"></result>
        </collection>
    </resultMap>

@@ -36,12 +37,13 @@
        FROM ums_depart ud
                 LEFT JOIN ums_depart_manager udm ON ud.id = udm.depart_id
                 LEFT JOIN ums_admin ua ON udm.user_id = ua.id
        where ud.is_deleted = 0
    </select>
    <select id="selectPageByName" resultMap="DepartVOMap">
        SELECT t_0.*,
        ua.id user_id,
        ua.username,
        dd.`name` as depart_type_name
        dd.`name` as depart_type_name,udm.is_leader
        FROM (
        SELECT ud.*
        FROM ums_depart ud