Merge remote-tracking branch 'origin/master'

src/main/resources/mappings/modules/wexintheorder/TheOrderInformationDao.xml

@@ -8,6 +8,7 @@
 	  a.update_by AS "updateBy.id",
 	  a.update_date AS "updateDate",
 	  a.del_flag as "delFlag",
+	  a.name as "name",
 	  a.remarks,
 	  a.team,
 	  a.financial,
@@ -32,7 +33,6 @@
 	<select id="findList" resultType="com.jeeplus.modules.wexintheorder.entity.TheOrderInformation" >
 		SELECT
 		<include refid="orderColumns"/>
-		,su.name as "name"
 		, concat_ws(" / ",a.department,a.specific) as department
 		FROM the_order_information a
 		<include refid="orderLeftJoinColumns"/>

src/main/resources/mappings/modules/wexintheorder/TheOrderWebDao.xml

@@ -75,7 +75,7 @@
 
 	<!-- 查询分管领导名称 -->
 	<select id="getLeadershipList" resultType="com.jeeplus.modules.wexintheorder.entity.TheOrder">
-		select distinct(a.department) as department from the_order a
+		select distinct(a.team) as department from the_order a
 		<where>
 			<if test="beginDate !=null">
 				and a.scheduled >= #{beginDate}
@@ -94,7 +94,7 @@
 		from the_order a
 			<include refid="orderLeftJoinColumns"/>
 		<where>
-			a.department=#{department}
+			a.team=#{department}
 			<if test="beginDate !=null">
 				and a.scheduled >= #{beginDate}
 			</if>