Merge branch 'dev' of 113.31.163.91:quanshu/mp-server into dev

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/TicketBoxMgrController.java

@@ -93,7 +93,12 @@ public class TicketBoxMgrController extends BaseApiController {
 	@PreAuthorize("@ss.hasPermi('business:ticket:list')")
 	public TableDataInfo list(@RequestBody TicketBox ticketBox) {
 		startPage();
-		List<TicketBox> list = ticketBoxService.list(new QueryWrapper<TicketBox>().orderByDesc("FIELD(`status`, 'wait', 'doing', 'done', 'on', 'off')").orderByDesc("box_id"));
+		QueryWrapper<TicketBox> queryWrapper = new QueryWrapper<TicketBox>();
+		queryWrapper.like(null != ticketBox && StringUtils.isNotBlank(ticketBox.getTitle()), "title", ticketBox.getTitle());
+		queryWrapper.eq(null != ticketBox && null != ticketBox.getType(), "type", ticketBox.getType());
+		queryWrapper.eq(null != ticketBox && null != ticketBox.getStatus(), "status", ticketBox.getStatus());
+		queryWrapper.orderByDesc("FIELD(`status`, 'wait', 'doing', 'done', 'on', 'off')").orderByDesc("box_id");
+		List<TicketBox> list = ticketBoxService.list(queryWrapper);
 		return getDataTable(list);
 	}