提交 6f2d2884 authored 作者: niguanghui's avatar niguanghui

--no commit message

上级 b9b177e6
...@@ -29,7 +29,6 @@ import com.zrqx.core.form.resource.bg.themeLexicon.ThemeLexiconForm; ...@@ -29,7 +29,6 @@ import com.zrqx.core.form.resource.bg.themeLexicon.ThemeLexiconForm;
import com.zrqx.core.form.resource.bg.themeLexicon.ThemeLexiconStatusForm; import com.zrqx.core.form.resource.bg.themeLexicon.ThemeLexiconStatusForm;
import com.zrqx.core.model.resource.themeLexicon.ThemeLexicon; import com.zrqx.core.model.resource.themeLexicon.ThemeLexicon;
import com.zrqx.core.util.CallBack; import com.zrqx.core.util.CallBack;
import com.zrqx.core.util.Copy;
import com.zrqx.core.util.PageInfo; import com.zrqx.core.util.PageInfo;
import com.zrqx.core.util.PageParam; import com.zrqx.core.util.PageParam;
import com.zrqx.core.vo.resource.themeLexicon.ThemeLexiconVo; import com.zrqx.core.vo.resource.themeLexicon.ThemeLexiconVo;
...@@ -133,9 +132,10 @@ public class ThemeLexiconController { ...@@ -133,9 +132,10 @@ public class ThemeLexiconController {
cr.andLike("chineseRoot", chineseRoot + "%"); cr.andLike("chineseRoot", chineseRoot + "%");
cr.orLike("chineseSynonym", chineseRoot + "%"); cr.orLike("chineseSynonym", chineseRoot + "%");
} }
List<ThemeLexicon> list = service.selectByCriteria(); PageInfo<ThemeLexicon> tlPage = service.queryCriteria(pageParam);
List<ThemeLexiconVo> listVo = Copy.copyList(list, ThemeLexiconVo.class); PageInfo<ThemeLexiconVo> pageInfo = new PageInfo<ThemeLexiconVo>();
return CallBack.success(new PageInfo<ThemeLexiconVo>(listVo)); BeanUtils.copyProperties(tlPage, pageInfo);
return CallBack.success(pageInfo);
} }
@ApiOperation(value = "查询中文词根是否已存在", notes = "查询中文词根是否已存在") @ApiOperation(value = "查询中文词根是否已存在", notes = "查询中文词根是否已存在")
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论