From cfb868149a11e8d4cfa4b3428823ab047a0458c5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 28 二月 2024 15:15:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
index 0f2e09a..99aefd1 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
@@ -205,6 +205,13 @@
+dataMap.get(Constants.MEMBER_IMG).getCode()
+obj.getFaceImg());
}
+ if(Objects.nonNull(obj.getType())){
+ if(!obj.getType().equals(Constants.memberType.visitor)){
+ obj.setExcelCompanyName(obj.getCompanyName());
+ }else{
+ obj.setExcelCompanyName(obj.getVisitCompanyName());
+ }
+ }
});
}
return PageData.from(retentionIPage);
--
Gitblit v1.9.3