Commit c1ad7bdd authored by 杨翌文's avatar 杨翌文

Merge remote-tracking branch 'origin/feature/20240918_chain' into feature/20240918_chain

parents 180a8f32 1fe3b7d8
...@@ -34,7 +34,7 @@ public class QaAssistantSaveDto implements Serializable { ...@@ -34,7 +34,7 @@ public class QaAssistantSaveDto implements Serializable {
@Schema(description = "知识库分类ID列表") @Schema(description = "知识库分类ID列表")
@JsonProperty("category_ids") @JsonProperty("category_ids")
private List<String> categoryIdList; private List<Integer> categoryIdList;
@Schema(description = "可见角色列表") @Schema(description = "可见角色列表")
@JsonProperty("visible_role_ids") @JsonProperty("visible_role_ids")
......
...@@ -127,8 +127,6 @@ public class AppChatCompletionService { ...@@ -127,8 +127,6 @@ public class AppChatCompletionService {
PageResult<QaAssistantDto> pageResult = PageResult.of(request.getPageNo(), request.getPageSize(), (int) page.getTotalRow(), null); PageResult<QaAssistantDto> pageResult = PageResult.of(request.getPageNo(), request.getPageSize(), (int) page.getTotalRow(), null);
Set<String> kbIdSet = new HashSet<>();
if(CollectionUtil.isNotEmpty(page.getRecords())) { if(CollectionUtil.isNotEmpty(page.getRecords())) {
List<QaAssistantDto> dtoList = page.getRecords().stream().map(v -> { List<QaAssistantDto> dtoList = page.getRecords().stream().map(v -> {
QaAssistantDto dto = BeanUtil.copyProperties(v, QaAssistantDto.class); QaAssistantDto dto = BeanUtil.copyProperties(v, QaAssistantDto.class);
...@@ -258,6 +256,8 @@ public class AppChatCompletionService { ...@@ -258,6 +256,8 @@ public class AppChatCompletionService {
UserQaRequestDto req = new UserQaRequestDto(); UserQaRequestDto req = new UserQaRequestDto();
req.setUserId(userPrincipal.getUserId()); req.setUserId(userPrincipal.getUserId());
req.setPageNo(request.getPageNo());
req.setPageSize(request.getPageSize());
PageResult<UserChatCompletionDto> userChatCompletionPageResult = userQaMobilePaginQuery(req); PageResult<UserChatCompletionDto> userChatCompletionPageResult = userQaMobilePaginQuery(req);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment