diff --git a/im-center-api/src/main/java/cn/axzo/im/center/api/feign/AccountRegisterApi.java b/im-center-api/src/main/java/cn/axzo/im/center/api/feign/AccountRegisterApi.java index c59a5f7..8031e41 100644 --- a/im-center-api/src/main/java/cn/axzo/im/center/api/feign/AccountRegisterApi.java +++ b/im-center-api/src/main/java/cn/axzo/im/center/api/feign/AccountRegisterApi.java @@ -11,6 +11,7 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import java.util.Date; import java.util.List; @@ -20,10 +21,10 @@ import java.util.Set; public interface AccountRegisterApi { @PostMapping("/api/im/account/register/page") - ApiPageResult page(PageAccountRegisterParam param); + ApiPageResult page(@RequestBody PageAccountRegisterParam param); @PostMapping("/api/im/account/register/list") - ApiListResult list(ListAccountRegisterParam param); + ApiListResult list(@RequestBody ListAccountRegisterParam param); @Data @SuperBuilder diff --git a/im-center-api/src/main/java/cn/axzo/im/center/api/feign/MessageHistoryApi.java b/im-center-api/src/main/java/cn/axzo/im/center/api/feign/MessageHistoryApi.java index 70f0008..3276cd3 100644 --- a/im-center-api/src/main/java/cn/axzo/im/center/api/feign/MessageHistoryApi.java +++ b/im-center-api/src/main/java/cn/axzo/im/center/api/feign/MessageHistoryApi.java @@ -11,6 +11,7 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import java.util.Date; import java.util.List; @@ -20,10 +21,10 @@ import java.util.Set; public interface MessageHistoryApi { @PostMapping("/api/im/message/history/page") - ApiPageResult page(PageMessageHistoryParam param); + ApiPageResult page(@RequestBody PageMessageHistoryParam param); @PostMapping("/api/im/message/history/list") - ApiListResult list(ListMessageHistoryParam param); + ApiListResult list(@RequestBody ListMessageHistoryParam param); @SuperBuilder @Data diff --git a/im-center-server/src/main/java/cn/axzo/im/service/MessageHistoryService.java b/im-center-server/src/main/java/cn/axzo/im/service/MessageHistoryService.java index 176ce52..ce99a3e 100644 --- a/im-center-server/src/main/java/cn/axzo/im/service/MessageHistoryService.java +++ b/im-center-server/src/main/java/cn/axzo/im/service/MessageHistoryService.java @@ -83,12 +83,12 @@ public interface MessageHistoryService extends IService { private OrganizationalUnitVO receiveOrganizationalUnit; public static MessageHistoryDTO from(MessageHistory messageHistory, - Map personProfiles, + Map personProfiles, Map organizationals) { MessageHistoryDTO messageHistoryDTO = MessageHistoryDTO.builder().build(); BeanUtils.copyProperties(messageHistory, messageHistoryDTO); - messageHistoryDTO.setReceivePersonProfile(personProfiles.get(Long.valueOf(messageHistoryDTO.getReceivePersonId()))); + messageHistoryDTO.setReceivePersonProfile(personProfiles.get(messageHistoryDTO.getReceivePersonId())); messageHistoryDTO.setReceiveOrganizationalUnit(organizationals.get(messageHistoryDTO.getReceiveOuId())); return messageHistoryDTO; } diff --git a/im-center-server/src/main/java/cn/axzo/im/service/impl/MessageHistoryServiceImpl.java b/im-center-server/src/main/java/cn/axzo/im/service/impl/MessageHistoryServiceImpl.java index 819f5e7..6bec683 100644 --- a/im-center-server/src/main/java/cn/axzo/im/service/impl/MessageHistoryServiceImpl.java +++ b/im-center-server/src/main/java/cn/axzo/im/service/impl/MessageHistoryServiceImpl.java @@ -46,7 +46,7 @@ public class MessageHistoryServiceImpl extends ServiceImpl page = this.page(PageConverter.convertToMybatis(param, MessageHistory.class), wrapper); - Map personProfiles = listReceiveUserPersonProfile(param, page.getRecords()); + Map personProfiles = listReceiveUserPersonProfile(param, page.getRecords()); Map organizationals = listReceiveOrganizational(param, page.getRecords()); @@ -66,7 +66,7 @@ public class MessageHistoryServiceImpl extends ServiceImpl listReceiveUserPersonProfile(PageMessageHistoryParam param, + private Map listReceiveUserPersonProfile(PageMessageHistoryParam param, List messageHistories) { if (CollectionUtils.isEmpty(messageHistories) || BooleanUtils.isNotTrue(param.isNeedReceiveUserInfo())) { return Collections.emptyMap(); @@ -84,7 +84,7 @@ public class MessageHistoryServiceImpl extends ServiceImpl e.getId().toString(), Function.identity())); } private Map listReceiveOrganizational(PageMessageHistoryParam param,