--no commit message

com.zrqx.bg.sysuser/src/main/java/com/zrqx/bg/sysuser/mapper/activity/ActivityApplyMapper.java

@@ -24,8 +24,8 @@ public interface ActivityApplyMapper extends BaseMapper<ActivityApply>{
 	 */
 	@Select("<script>"
 			+ " select a.*, b.title as name "
-			+ " from sys_activity_apply a , sys_activity b "
-			+ " where a.activityId = b.id "
+			+ " from sys_activity_apply a left join sys_activity b "
+			+ " on a.activityId = b.id where 1=1 "
 			// 状态
 			+ " <if test = '" + NOTBLANK + "(form.status)'> "  
 		    + " and a.status like concat(#{form.status},'%') "