提交全图监控

sckw-modules/sckw-system/src/main/java/com/sckw/system/repository/SysDictTypeRepository.java

@@ -48,12 +48,15 @@ public class SysDictTypeRepository extends ServiceImpl<SysDictTypeDao, SysDictTy
     /**
      * 分页查询字典类型
      */
-    public IPage<SysDictType> selectPage(int pageNum, int pageSize, String name, String type, Integer status) {
+    public IPage<SysDictType> selectPage(int pageNum, int pageSize, String name, String type, Integer status,String  keyword) {
         return this.page(new Page<>(pageNum, pageSize), Wrappers.<SysDictType>lambdaQuery()
                 .eq(SysDictType::getDelFlag, 0)
                 .eq(Objects.nonNull( status), SysDictType::getStatus, status)
                 .like(StringUtils.isNotBlank( name),SysDictType::getName, name)
                 .like(StringUtils.isNotBlank(type), SysDictType::getType, type)
+                .and(StringUtils.isNotBlank(keyword),w -> w.like(SysDictType::getName, keyword)
+                        .or()
+                        .like(SysDictType::getType, keyword))
                 .orderByDesc(SysDictType::getCreateTime)
                );
     }

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/SysDictTypeService.java

@@ -95,7 +95,7 @@ public class SysDictTypeService {
         log.info("分页查询字典类型,请求参数：{}", JSON.toJSONString(reqVo));
         int pageNum = reqVo.getPageNum();
         int pageSize = reqVo.getPageSize();
-        IPage<SysDictType> page = sysDictTypeService.selectPage(pageNum, pageSize, reqVo.getName(), reqVo.getType(), reqVo.getStatus());
+        IPage<SysDictType> page = sysDictTypeService.selectPage(pageNum, pageSize, reqVo.getName(), reqVo.getType(), reqVo.getStatus(),reqVo.getKeyword());
         List<SysDictType> records = page.getRecords();
         if (CollectionUtils.isEmpty(records)) {
             return PageDataResult.empty(reqVo.getPageNum(), reqVo.getPageSize());