From 50353c2ae43cdddb8433358f4ba66bef30c5d628 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 05 十一月 2024 14:00:12 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 72dbddb..a2446bb 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -1462,6 +1462,19 @@
                 if(StringUtils.isNotBlank(memberInfoDTO.getImgurl())){
                     memberInfoDTO.setImgurlFull(prefixUrl + memberInfoDTO.getImgurl());
                 }
+                memberInfoDTO.setHasFace(memberInfoDTO.getFaceId()!=null?Constants.ONE:Constants.ZERO);
+                if(Constants.equalsInteger(Constants.ONE,memberInfoDTO.getAuthStatus())){
+                    if(memberInfoDTO.getStartTime() ==null || memberInfoDTO.getEndTime() ==null ){
+                        memberInfoDTO.setRoleTimeInfo("闀挎湡鏈夋晥");
+                    }else{
+                        memberInfoDTO.setRoleTimeInfo(DateUtil.getPlusTime2(memberInfoDTO.getStartTime())+"鑷�"+DateUtil.getPlusTime2(memberInfoDTO.getEndTime()));
+                    }
+                }else{
+                    memberInfoDTO.setRoleTimeInfo("-");
+                }
+                memberInfoDTO.setAuthStatus(Constants.formatIntegerNum(memberInfoDTO.getAuthStatus()));
+                memberInfoDTO.setWorkStatus(Constants.formatIntegerNum(memberInfoDTO.getWorkStatus()));
+                memberInfoDTO.setSex(Constants.formatIntegerNum(memberInfoDTO.getSex()));
             }
         }
         return PageData.from(memberIPage);

--
Gitblit v1.9.3