fix

netflix-dao/src/main/java/com/cyksj/model/entity/GroupsRelationExpiryRecord.java

@@ -17,8 +17,6 @@ import java.util.Date;
 public class GroupsRelationExpiryRecord extends BaseEntity {
 	private Long userId;
 
-	private String showId;
-
 	private String nickname;
 
 	/**

netflix-web/src/main/java/com/cyksj/web/controller/manage/group/CmsGroupsRelationExpiryController.java

@@ -2,13 +2,16 @@ package com.cyksj.web.controller.manage.group;
 
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.GroupsRelationCustomerServiceFollowRecordMapper;
 import com.cyksj.mapper.GroupsRelationExpiryRecordMapper;
+import com.cyksj.mapper.UserMapper;
 import com.cyksj.model.entity.GroupsRelationCustomerServiceFollowRecord;
 import com.cyksj.model.entity.GroupsRelationExpiryRecord;
+import com.cyksj.model.entity.User;
 import com.cyksj.service.user.UserBackService;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
@@ -40,16 +43,24 @@ public class CmsGroupsRelationExpiryController {
 
 	private final GroupsRelationCustomerServiceFollowRecordMapper relationCustomerServiceFollowRecordMapper;
 
+	private final UserMapper userMapper;
+
 	/**
 	 * 到期用户 客服跟进续费列表
 	 */
 	@GetMapping("/get")
-	public Result<SearchResult<GroupsRelationExpiryRecord>> get() {
+	public Result<SearchResult<GroupsRelationExpiryRecord>> get(String showId) {
 		long adminId = StpUtil.getLoginIdAsLong();
 		MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
 		if (userBackService.isCustomer(adminId)) {
 			builder.field(GroupsRelationExpiryRecord::getCustomerServiceId, adminId);
 		}
+		if (StrUtil.isNotBlank(showId)) {
+			User user = userMapper.selectOne(Wrappers.lambdaQuery(User.class).eq(User::getShowId, showId).last("limit 1"));
+			if (user != null) {
+				builder.field(GroupsRelationExpiryRecord::getUserId, user.getId());
+			}
+		}
 		SearchResult<GroupsRelationExpiryRecord> search = beanSearcher.search(GroupsRelationExpiryRecord.class, builder
 				.orderBy(GroupsRelationExpiryRecord::getId).desc()
 				.build());