bug53616系统数据字典搜索
This commit is contained in:
+11
-3
@@ -10,7 +10,6 @@ import com.jero.common.constant.CacheConstant;
|
||||
import com.jero.common.constant.CommonConstant;
|
||||
import com.jero.common.constant.enums.CutEnum;
|
||||
import com.jero.common.exception.JeroBootException;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
import com.jero.modules.enums.DictCodeEnum;
|
||||
import com.jero.modules.enums.FixedFieldEnum;
|
||||
import com.jero.modules.enums.IsTagDict;
|
||||
@@ -66,9 +65,18 @@ public class SysDictItemController {
|
||||
public Result<IPage<SysDictItem>> queryPageList(SysDictItem sysDictItem,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) {
|
||||
Result<IPage<SysDictItem>> result = new Result<IPage<SysDictItem>>();
|
||||
QueryWrapper<SysDictItem> queryWrapper = QueryGenerator.initQueryWrapper(sysDictItem, req.getParameterMap());
|
||||
queryWrapper.orderByDesc("sort_order").eq("del_flag",CommonConstant.DEL_FLAG_0);
|
||||
// QueryWrapper<SysDictItem> queryWrapper = QueryGenerator.initQueryWrapper(sysDictItem, req.getParameterMap());
|
||||
Page<SysDictItem> page = new Page<SysDictItem>(pageNo, pageSize);
|
||||
QueryWrapper<SysDictItem> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.orderByDesc("sort_order")
|
||||
.eq("del_flag",CommonConstant.DEL_FLAG_0)
|
||||
.eq("dict_id",sysDictItem.getDictId());
|
||||
if(StringUtils.isNotEmpty(sysDictItem.getItemText())){
|
||||
queryWrapper.like("item_text",sysDictItem.getItemText());
|
||||
}
|
||||
if(sysDictItem.getStatus() != null){
|
||||
queryWrapper.like("status",sysDictItem.getStatus());
|
||||
}
|
||||
IPage<SysDictItem> pageList = sysDictItemService.page(page, queryWrapper);
|
||||
result.setSuccess(true);
|
||||
result.setResult(pageList);
|
||||
|
||||
Reference in New Issue
Block a user