Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/luckyDraw/mapper/xml/LuckyDrawInfoMapper.xml

@@ -65,6 +65,7 @@
         select
         <include refid="Events_Column_List"></include>
         from lucky_draw_awards lda
+        left join lucky_draw_events lde on lda.events_id = lde.id
         ${ew.customSqlSegment}
     </select>
 </mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/luckyDraw/service/LuckyDrawInfoService.java

@@ -43,6 +43,7 @@ public class LuckyDrawInfoService extends ServiceImpl<LuckyDrawInfoMapper, Lucky
         QueryWrapper<LuckyDrawInfoDto> queryWrapper = QueryWrapperGenerator.buildQueryCondition(dto, LuckyDrawInfoDto.class);
 
         queryWrapper.eq("lda.del_flag", "0");
+        queryWrapper.eq("lde.switch_flag", "1");
         if (StringUtils.isNotEmpty(dto.getId())) {
             queryWrapper.eq("lda.events_id",dto.getId());
         }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/luckyDraw/service/LuckyDrawMembersService.java

@@ -109,6 +109,9 @@ public class LuckyDrawMembersService extends ServiceImpl<LuckyDrawMembersMapper,
         if (StringUtils.isNotEmpty(dto.getOfficeName())) {
             queryWrapper.eq("a.office_name", dto.getOfficeName());
         }
+        if (StringUtils.isNotEmpty(dto.getEventName())) {
+            queryWrapper.like("b.name", dto.getEventName());
+        }
 
         return membersMapper.findList(page, queryWrapper);
     }