|
@@ -73,7 +73,7 @@ public class EquipmentController {
|
|
|
.field(EquipmentUserDistributeDetailView::getShareId, shareId)
|
|
.field(EquipmentUserDistributeDetailView::getShareId, shareId)
|
|
|
.build());
|
|
.build());
|
|
|
search.getDataList().forEach(data -> {
|
|
search.getDataList().forEach(data -> {
|
|
|
- User user = userMapper.selectById(data.getShareId());
|
|
|
|
|
|
|
+ User user = userMapper.selectById(data.getUserId());
|
|
|
Optional.ofNullable(user).ifPresent(u -> data.setNickname(u.getNickname()));
|
|
Optional.ofNullable(user).ifPresent(u -> data.setNickname(u.getNickname()));
|
|
|
String couponName = couponMapper.getCouponNameByCouponUserId(data.getCouponUserId());
|
|
String couponName = couponMapper.getCouponNameByCouponUserId(data.getCouponUserId());
|
|
|
data.setCouponName(couponName);
|
|
data.setCouponName(couponName);
|