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-19 15:33:59 +08:00
commit c3869495e3
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,10 +110,9 @@ 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); System.out.println("kmsSearchDto: " + 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/service/knows/KnowledgeServiceImpl.java
View File

@ -139,7 +139,6 @@ 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);