Browse Source

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

master
jianjun 4 years ago
parent
commit
d9c98c3085
  1. 2
      epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointUserTotalDetailServiceImpl.java

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

@ -218,7 +218,7 @@ public class BizPointUserTotalDetailServiceImpl extends BaseServiceImpl<BizPoint
} else {
item.setName(StrConstant.EPMETY_STR);
if (StringUtils.isNotBlank(user.getSurname())){
item.setName(user.getName());
item.setName(user.getShowName());
}
if (StringUtils.isNotBlank(user.getName())){
item.setName(item.getName().concat(user.getName()));

Loading…
Cancel
Save