|
|
|
@@ -351,7 +351,7 @@ public class InvestBizServiceImpl implements InvestBizService { |
|
|
|
InvestMessageEntity messageEntity = new InvestMessageEntity(); |
|
|
|
messageEntity.setOwner(InvestUserContext.getUserId()); |
|
|
|
query.setQueryData(messageEntity); |
|
|
|
query.setSortColumn("createDate"); |
|
|
|
query.setSortColumn("create_date"); |
|
|
|
query.setSortOrder("desc"); |
|
|
|
return messageService.queryPage(query); |
|
|
|
} |
|
|
|
@@ -508,7 +508,6 @@ public class InvestBizServiceImpl implements InvestBizService { |
|
|
|
if (CollectionUtils.isEmpty(contentList)) { |
|
|
|
return recordVo; |
|
|
|
} |
|
|
|
|
|
|
|
for (TableTriple record : contentList) { |
|
|
|
InvestOperateRecordVo itemVo = new InvestOperateRecordVo(); |
|
|
|
BeanUtils.copyProperties(recordEntity, itemVo); |
|
|
|
@@ -552,7 +551,10 @@ public class InvestBizServiceImpl implements InvestBizService { |
|
|
|
followRecordVo.setCustomer(customerEntity); |
|
|
|
followRecordVo.setMemberInfo(ownerInfo); |
|
|
|
followRecordVo.setBrand(brand); |
|
|
|
followRecordVo.setOwnerInfo(usersMap.get(item.getOwner())); |
|
|
|
if (Objects.nonNull(usersMap.get(item.getOwner()))) { |
|
|
|
followRecordVo.setOwnerInfo(usersMap.get(item.getOwner())); |
|
|
|
followRecordVo.setOperatorName(usersMap.get(item.getOwner()).getName()); |
|
|
|
} |
|
|
|
BeanUtils.copyProperties(item, followRecordVo); |
|
|
|
return followRecordVo; |
|
|
|
} |
|
|
|
|