Merge branch 'dev_point_rank_bugfix' into dev

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

@@ -214,7 +214,7 @@ public class BizPointUserTotalDetailServiceImpl extends BaseServiceImpl<BizPoint
                 user -> {
                     //楼院小组显示昵称，支部小组显示姓名
                     if (("ordinary").equals(group.getData().getGroupType())) {
-                        item.setName(user.getNickname());
+                        item.setName(StringUtils.isBlank(user.getNickname()) ? StrConstant.EPMETY_STR : user.getNickname());
                     } else {
                         item.setName(StrConstant.EPMETY_STR);
                         if (StringUtils.isNotBlank(user.getSurname())){