fix 分销记录

netflix-dao/src/main/java/com/cyksj/model/views/EquipmentUserDistributeViews.java

@@ -6,7 +6,6 @@ import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.Date;
 import java.util.List;
 
 /*
@@ -17,12 +16,13 @@ import java.util.List;
  */
 @Getter
 @Setter
-@SearchBean(tables = "equipment_user_chance ec")
+@SearchBean(tables = "equipment_user_distribute_invite_record ec left join user u on u.id = ec.share_id",
+		groupBy = "ec.share_id,u.nickname")
 public class EquipmentUserDistributeViews {
-	@DbField("ec.user_id")
+	@DbField("ec.share_id")
 	private Long shareId;
 
-	@DbIgnore
+	@DbField("u.nickname")
 	private String nickname;
 
 	/**
@@ -33,7 +33,4 @@ public class EquipmentUserDistributeViews {
 
 	@DbIgnore
 	private List<EquipmentBenefitsView> benefitsViews;
-
-	@DbField("ec.created_time")
-	private Date createdTime;
 }

netflix-web/src/main/java/com/cyksj/web/controller/manage/distribute/EquipmentController.java

@@ -54,8 +54,6 @@ public class EquipmentController {
 	public Result<SearchResult<EquipmentUserDistributeViews>> getEquipmentDistribute() {
 		SearchResult<EquipmentUserDistributeViews> search = beanSearcher.search(EquipmentUserDistributeViews.class, MapUtils.flatBuilder(request.getParameterMap()).build());
 		search.getDataList().forEach(data -> {
-			User user = userMapper.selectById(data.getShareId());
-			Optional.ofNullable(user).ifPresent(u -> data.setNickname(u.getNickname()));
 			data.setRecordNum(payRecordMapper.selectCount(Wrappers.lambdaQuery(EquipmentUserPayRecord.class)
 					.eq(EquipmentUserPayRecord::getShareId, data.getShareId())));
 			data.setBenefitsViews(beanSearcher.searchAll(EquipmentBenefitsView.class, MapUtils.builder().field(EquipmentBenefitsView::getSharId, data.getShareId()).build()));