sccg_server.git

			@@ -23,9 +23,11 @@

			<resultMap id="DepartVOMap" type="com.ycl.vo.depart.UmsDepartVO" extends="BaseResultMap">
			<result column="depart_type_name" property="departTypeName" jdbcType="VARCHAR"></result>
			<result column="p_depart_name" property="parentDepartName" jdbcType="VARCHAR"></result>
			<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 +38,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,pd.depart_name as p_depart_name
			FROM (
			SELECT ud.*
			FROM ums_depart ud
			@@ -49,12 +52,13 @@
			<if test="departName!=null and departName!=''">
			and ud.name like CONCAT('%',#{departName},'%')
			</if>
			ORDER BY create_time desc
			ORDER BY ud.parent_id,ud.id desc
			LIMIT #{offset}, #{size}
			) t_0
			LEFT JOIN ums_depart_manager udm ON t_0.id = udm.depart_id
			LEFT JOIN ums_admin ua ON udm.user_id = ua.id
			left join ums_data_dictionary as dd on t_0.depart_type = dd.id
			left join ums_depart as pd on t_0.parent_id = pd.id
			</select>