Merge branch 'system-zyj' of uskycloud/usky-cloud into system-165

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/HceArticleServiceImpl.java

@@ -42,7 +42,8 @@ public class HceArticleServiceImpl extends AbstractCrudService<HceArticleMapper,
         IPage<HceArticle> page = new Page<>(hceArticleVO.getPageNum(),hceArticleVO.getPageSize());
 
         LambdaQueryWrapper<HceArticle> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(hceArticleVO.getCategoryid() != null,HceArticle::getCategoryid,hceArticleVO.getCategoryid())
+        queryWrapper.eq(hceArticleVO.getId() != null,HceArticle::getId,hceArticleVO.getId())
+                .eq(hceArticleVO.getCategoryid() != null,HceArticle::getCategoryid,hceArticleVO.getCategoryid())
                 .like(StringUtils.isNotBlank(hceArticleVO.getTitle()),HceArticle::getTitle,hceArticleVO.getTitle())
                 .between(StringUtils.isNotBlank(hceArticleVO.getStartTime()) && StringUtils.isNotBlank(hceArticleVO.getEndTime()),HceArticle::getCreatedate,hceArticleVO.getStartTime(),hceArticleVO.getEndTime())
                 .orderByDesc(HceArticle::getIstop).orderByAsc(HceArticle::getSortindex, HceArticle::getId);

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/vo/HceArticleVO.java

@@ -4,6 +4,8 @@ import lombok.Data;
 
 @Data
 public class HceArticleVO {
+    private Integer id;
+
     /**
      * 栏目ID
      */