Merge remote-tracking branch 'origin/master'
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled

This commit is contained in:
Pancaihua 2024-08-29 14:18:18 +08:00
commit 8b6a2d6b06
3 changed files with 1 additions and 3 deletions

View File

@ -110,7 +110,6 @@ 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: " + 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);
return success(BeanUtils.toBean(list, KnowledgeRespVO.class)); return success(BeanUtils.toBean(list, KnowledgeRespVO.class));

View File

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

View File

@ -64,7 +64,7 @@ public class KnowledgeServiceImpl implements KnowledgeService {
public Long createKnowledge(Long userId,KnowledgeSaveReqVO createReqVO){ public Long createKnowledge(Long userId,KnowledgeSaveReqVO createReqVO){
// 插入 // 插入
KnowledgeDO knowledge = BeanUtils.toBean(createReqVO, KnowledgeDO.class) KnowledgeDO knowledge = BeanUtils.toBean(createReqVO, KnowledgeDO.class)
.setUserId(userId).setFlowStatus(BpmTaskStatusEnum.RUNNING.getStatus());; .setUserId(userId).setFlowStatus(BpmTaskStatusEnum.RUNNING.getStatus());
knowledgeMapper.insert(knowledge); knowledgeMapper.insert(knowledge);
// 插入子表 // 插入子表
createCommentList(knowledge.getId(), createReqVO.getComments()); createCommentList(knowledge.getId(), createReqVO.getComments());