WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug53616系统数据字典搜索

Browse Source
This commit is contained in:
xiejunyu
2022-06-06 15:36:46 +08:00
parent 510c8944c9
commit 80b9cae192
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java
+11 -3
View File
@@ -10,7 +10,6 @@ import com.jero.common.constant.CacheConstant;
import com.jero.common.constant.CommonConstant; import com.jero.common.constant.CommonConstant;
import com.jero.common.constant.enums.CutEnum; import com.jero.common.constant.enums.CutEnum;
import com.jero.common.exception.JeroBootException; import com.jero.common.exception.JeroBootException;
import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.enums.DictCodeEnum; import com.jero.modules.enums.DictCodeEnum;
import com.jero.modules.enums.FixedFieldEnum; import com.jero.modules.enums.FixedFieldEnum;
import com.jero.modules.enums.IsTagDict; 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, public Result<IPage<SysDictItem>> queryPageList(SysDictItem sysDictItem,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) {
Result<IPage<SysDictItem>> result = new Result<IPage<SysDictItem>>(); Result<IPage<SysDictItem>> result = new Result<IPage<SysDictItem>>();
QueryWrapper<SysDictItem> queryWrapper = QueryGenerator.initQueryWrapper(sysDictItem, req.getParameterMap()); // QueryWrapper<SysDictItem> queryWrapper = QueryGenerator.initQueryWrapper(sysDictItem, req.getParameterMap());
queryWrapper.orderByDesc("sort_order").eq("del_flag",CommonConstant.DEL_FLAG_0);
Page<SysDictItem> page = new Page<SysDictItem>(pageNo, pageSize); 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); IPage<SysDictItem> pageList = sysDictItemService.page(page, queryWrapper);
result.setSuccess(true); result.setSuccess(true);
result.setResult(pageList); result.setResult(pageList);