yudao-team/oa-master
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Pancaihua 2024-08-16 14:46:09 +08:00
commit 50d7208e05
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/knows/KnowledgeController.java
View File

@ -110,8 +110,10 @@ public class KnowledgeController {
@GetMapping("/listForEs") @GetMapping("/listForEs")
@Operation(summary = "获得查询分页") @Operation(summary = "获得查询分页")
public CommonResult<List<KnowledgeRespVO>> getKnowsList(@Valid KmsSearchDto kmsSearchDto) { public CommonResult<List<KnowledgeRespVO>> getKnowsList(@Valid KmsSearchDto kmsSearchDto) {
System.out.println("获得查询分页获得查询分页获得查询分页获得查询分页"+kmsSearchDto);
//PageResult<KnowledgeDO> pageResult = knowledgeService.getKnowledgePage(pageReqVO); //PageResult<KnowledgeDO> pageResult = knowledgeService.getKnowledgePage(pageReqVO);
List<KnowledgeDO> list = knowledgeService.getKnowsList(kmsSearchDto); List<KnowledgeDO> list = knowledgeService.getKnowsList(kmsSearchDto);
System.out.println("获得查询分页获得查询分页获得查询分页获得查询分页"+list);
return success(BeanUtils.toBean(list, KnowledgeRespVO.class)); return success(BeanUtils.toBean(list, KnowledgeRespVO.class));
} }
@GetMapping("/page-user") @GetMapping("/page-user")

1
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/star2/Star2Controller.java
View File

@ -92,6 +92,7 @@ public class Star2Controller {
@Operation(summary = "获得收藏管理分页") @Operation(summary = "获得收藏管理分页")
@PreAuthorize("@ss.hasPermission('bpm:star2:query')") @PreAuthorize("@ss.hasPermission('bpm:star2:query')")
public CommonResult<PageResult<Star2RespVO>> getStar2Page(@Valid Star2PageReqVO pageReqVO) { public CommonResult<PageResult<Star2RespVO>> getStar2Page(@Valid Star2PageReqVO pageReqVO) {
System.out.println("获得收藏管理分页"+pageReqVO);
PageResult<Star2DO> pageResult = star2Service.getStar2Page(pageReqVO); PageResult<Star2DO> pageResult = star2Service.getStar2Page(pageReqVO);
if (CollUtil.isEmpty(pageResult.getList())) { if (CollUtil.isEmpty(pageResult.getList())) {
return success(new PageResult<>(pageResult.getTotal())); return success(new PageResult<>(pageResult.getTotal()));

1
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/knows/KnowledgeServiceImpl.java
View File

@ -123,6 +123,7 @@ public class KnowledgeServiceImpl implements KnowledgeService {
} }
public List<KnowledgeDO> getKnowsList(KmsSearchDto kmsSearchDto) { public List<KnowledgeDO> getKnowsList(KmsSearchDto kmsSearchDto) {
System.out.println("getKnowsListgetKnowsListgetKnowsList"+kmsSearchDto);
// return knowledgeMapper.selectPage(userId, pageReqVO); // return knowledgeMapper.selectPage(userId, pageReqVO);
KnowledgeDO knowledgeDo = new KnowledgeDO(); KnowledgeDO knowledgeDo = new KnowledgeDO();
return EsearchUtils.selectForEs(kmsSearchDto,knowledgeDo,indexName,KnowledgeDO.class); return EsearchUtils.selectForEs(kmsSearchDto,knowledgeDo,indexName,KnowledgeDO.class);