|
@@ -72,8 +72,11 @@ public class SysDictController {
|
|
|
@RequestMapping(value = "/list", method = RequestMethod.GET)
|
|
|
public Result<IPage<SysDict>> queryPageList(SysDict sysDict,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
|
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) {
|
|
|
+ SysDict sysDict1 = new SysDict();
|
|
|
Result<IPage<SysDict>> result = new Result<IPage<SysDict>>();
|
|
|
- QueryWrapper<SysDict> queryWrapper = QueryGenerator.initQueryWrapper(sysDict, req.getParameterMap());
|
|
|
+ QueryWrapper<SysDict> queryWrapper = QueryGenerator.initQueryWrapper(sysDict1, req.getParameterMap());
|
|
|
+ if(sysDict.getDictName()!=null) queryWrapper.like("dict_name",sysDict.getDictName());
|
|
|
+ if(sysDict.getDictCode()!=null) queryWrapper.like("dict_code",sysDict.getDictCode());
|
|
|
Page<SysDict> page = new Page<SysDict>(pageNo, pageSize);
|
|
|
IPage<SysDict> pageList = sysDictService.page(page, queryWrapper);
|
|
|
log.debug("查询当前页:"+pageList.getCurrent());
|