Merge remote-tracking branch 'origin/doubleEleven2020' into doubleEleven2020

mec-biz/src/main/java/com/ym/mec/biz/dal/page/LuckDrawQueryInfo.java

@@ -17,6 +17,8 @@ public class LuckDrawQueryInfo extends QueryInfo {
 	private Date endDate;
 
 	private Integer groupId;
+	
+	private Integer organId;
 
 	public String getName() {
 		return name;
@@ -65,4 +67,12 @@ public class LuckDrawQueryInfo extends QueryInfo {
 	public void setGroupId(Integer groupId) {
 		this.groupId = groupId;
 	}
+
+	public Integer getOrganId() {
+		return organId;
+	}
+
+	public void setOrganId(Integer organId) {
+		this.organId = organId;
+	}
 }

mec-biz/src/main/resources/config/mybatis/LuckDrawLogMapper.xml

@@ -44,6 +44,9 @@
 			<if test="endDate != null">
 				and l.create_on_ &lt;= #{endDate}
 			</if>
+			<if test="organId != null">
+				and u.organ_id_ = #{organId}
+			</if>
 		</where>
 	</sql>
 
@@ -98,7 +101,7 @@
 	</select>
 
 	<select id="queryPage" parameterType="map" resultMap="BaseResultMapExt">
-		select l.*,u.username_,u.phone_,o.name_ organ_name_ from luck_draw_log l 
+		select <include refid="Base_Column_List" />,u.username_,u.phone_,o.name_ organ_name_ from luck_draw_log l 
 		left join luck_draw_prize d on l.prize_id_ = d.id_ 
 		left join sys_user u on u.id_=l.user_id_
 		left join organization o on o.id_ = u.organ_id_