Merge branch 'master' of http://git.dayaedu.com/yonge/mec

cms/src/main/resources/config/mybatis/SysNewsInformationMapper.xml

@@ -17,6 +17,8 @@
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="del_flag_" property="delFlag" />
+		<result column="href_target_" property="hrefTarget" />
+		<result column="order_" property="order" />
 	</resultMap>
 	
 	<sql id="queryCondition">
@@ -49,8 +51,8 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.cms.dal.entity.SysNewsInformation" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO sys_news_information (id_,title_,content_,cover_image_,type_,status_,create_time_,update_time_,link_url_,href_target_,order_,del_flag_)
-		VALUES(#{id},#{title},#{content},#{coverImage},#{type},#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),now(),#{linkUrl},#{hrefTarget},#{order},0)
+		INSERT INTO sys_news_information (id_,title_,content_,cover_image_,type_,status_,create_time_,update_time_,link_url_,href_target_,order_,del_flag_,href_target_,order_)
+		VALUES(#{id},#{title},#{content},#{coverImage},#{type},#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),now(),#{linkUrl},#{hrefTarget},#{order},0,#{hrefTarget},#{order})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -100,7 +102,7 @@
 	<select id="queryPage" resultMap="SysNewsInformation" parameterType="map">
 		SELECT * FROM sys_news_information
 		<include refid="queryCondition" />
-		<include refid="global.orderby" />
+		order by order_ desc,update_time_ desc
 		<include refid="global.limit"/>
 	</select>