bug修复
This commit is contained in:
parent
b7a3cd22af
commit
af7894b520
@ -1,6 +1,7 @@
|
|||||||
package com.zhgd.xmgl.modules.urgentEvent.controller;
|
package com.zhgd.xmgl.modules.urgentEvent.controller;
|
||||||
|
|
||||||
import com.zhgd.annotation.OperLog;
|
import com.zhgd.annotation.OperLog;
|
||||||
|
import com.zhgd.xmgl.util.MapUtil;
|
||||||
import com.zhgd.xmgl.util.PageUtil;
|
import com.zhgd.xmgl.util.PageUtil;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiImplicitParam;
|
import io.swagger.annotations.ApiImplicitParam;
|
||||||
@ -27,6 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
|||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.collections.MapUtils;
|
import org.apache.commons.collections.MapUtils;
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
||||||
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
||||||
import org.jeecgframework.poi.excel.entity.ExportParams;
|
import org.jeecgframework.poi.excel.entity.ExportParams;
|
||||||
@ -72,6 +74,10 @@ public class UrgentEventInfoController {
|
|||||||
public Result<IPage<UrgentEventInfo>> queryPageList(@ApiIgnore @RequestBody Map<String, Object> map) {
|
public Result<IPage<UrgentEventInfo>> queryPageList(@ApiIgnore @RequestBody Map<String, Object> map) {
|
||||||
QueryWrapper<UrgentEventInfo> queryWrapper = QueryGenerator.initPageQueryWrapper(UrgentEventInfo.class, map);
|
QueryWrapper<UrgentEventInfo> queryWrapper = QueryGenerator.initPageQueryWrapper(UrgentEventInfo.class, map);
|
||||||
Page<UrgentEventInfo> page = PageUtil.getPage(map);
|
Page<UrgentEventInfo> page = PageUtil.getPage(map);
|
||||||
|
String typeId = MapUtils.getString(map, "typeId");
|
||||||
|
if (StringUtils.isNotBlank(typeId)) {
|
||||||
|
queryWrapper.eq("t.id", typeId);
|
||||||
|
}
|
||||||
IPage<UrgentEventInfo> pageList = urgentEventInfoService.pageList(page, queryWrapper);
|
IPage<UrgentEventInfo> pageList = urgentEventInfoService.pageList(page, queryWrapper);
|
||||||
return Result.success(pageList);
|
return Result.success(pageList);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user