hbwri/skjcmanager.git

			@@ -11,6 +11,7 @@
			<result property="reportTime" column="report_time"/>
			<result property="images" column="images" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
			<result property="videos" column="videos" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
			<result property="reportUser" column="real_name"/>

			<result property="createDept" column="create_dept"/>
			<result property="createUser" column="create_user"/>
			@@ -23,8 +24,9 @@
			</resultMap>

			<select id="selectRecordPage" resultMap="vo">
			SELECT R.*,arb."name" reservoirName FROM SM_MANAGE_PROTECT_RECORD R
			SELECT R.*,arb."name" reservoirName,U.REAL_NAME FROM SM_MANAGE_PROTECT_RECORD R
			LEFT JOIN SJZT_MD."att_res_base" arb on arb."guid" = R.reservoir_id
			LEFT JOIN BLADE_USER U ON U.ID = R.CREATE_USER
			WHERE R.IS_DELETED = 0
			<if test="record.reservoirName != null and record.reservoirName !=''">
			AND arb."name" LIKE CONCAT('%',#{record.reservoirName},'%')
			@@ -32,5 +34,6 @@
			<if test="record.type !=null and record.type !=''">
			AND R.type = #{record.type}
			</if>
			ORDER BY R.CREATE_TIME DESC
			</select>
			</mapper>