Merge branch 'dev_group_point' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointUserTotalDetailServiceImpl.java

@@ -20,14 +20,14 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.enums.BizTypeEnum;
-import com.epmet.commons.tools.enums.EventEnum;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.BizPointUserTotalDetailDao;
 import com.epmet.dto.BizPointUserTotalDetailDTO;
@@ -216,7 +216,13 @@ public class BizPointUserTotalDetailServiceImpl extends BaseServiceImpl<BizPoint
                     if (("ordinary").equals(group.getData().getGroupType())) {
                         item.setName(user.getNickname());
                     } else {
-                        item.setName(user.getName());
+                        item.setName(StrConstant.EPMETY_STR);
+                        if (StringUtils.isNotBlank(user.getSurname())){
+                            item.setName(user.getName());
+                        }
+                        if (StringUtils.isNotBlank(user.getName())){
+                            item.setName(item.getName().concat(user.getName());
+                        }
                     }
                     item.setHeadPhoto(user.getHeadImgUrl());
                 }
@@ -242,4 +248,4 @@ public class BizPointUserTotalDetailServiceImpl extends BaseServiceImpl<BizPoint
         return baseDao.selectIncrease(type, objectId);
     }
 
-}
+}