From b23a7cc13d3cac4a92dae9a454caa5d315318472 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 01 十一月 2024 14:01:42 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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 fcc146f..627869c 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
@@ -1144,7 +1144,7 @@
if(null != member.getQuerySpecial() && Constants.equalsInteger(member.getQuerySpecial(),Constants.ONE)){
String companySpecialId = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SPECIAL_COMPANY_ID).getCode();
if(StringUtils.isNotBlank(companySpecialId)){
- queryWrapper.apply(" find_in_set('"+companySpecialId+"',REPLACE(t2.company_path,'/','')) ");
+ queryWrapper.apply(" find_in_set('"+companySpecialId+"',REPLACE(t3.company_path,'/',',')) ");
}
}
queryWrapper.eq(Member::getIsdeleted,Constants.ZERO);
@@ -1459,6 +1459,16 @@
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("-");
+ }
}
}
return PageData.from(memberIPage);
--
Gitblit v1.9.3