From 9903c8d8979d8a196486fbd7e22ad5f8e146f1f5 Mon Sep 17 00:00:00 2001 From: Burce Date: Tue, 22 Oct 2019 15:46:20 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8B=9B=E5=95=86]adjust?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/domain/vo/invest/InvestFollowRecordVo.java | 3 +++ .../service/invest/impl/InvestBizServiceImpl.java | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestFollowRecordVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestFollowRecordVo.java index 29a0d2a8e..4047a75de 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestFollowRecordVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestFollowRecordVo.java @@ -24,4 +24,7 @@ public class InvestFollowRecordVo extends InvestFollowRecordEntity { @io.swagger.annotations.ApiModelProperty(value = "ownerInfo", name = "ownerInfo") private MallUserInfo ownerInfo; + + @io.swagger.annotations.ApiModelProperty(value = "操作人名称", name = "operatorName") + private String operatorName ; } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java index b84616bcc..318376cb0 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java @@ -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; }