Browse Source

1.代码合并遗漏

yuanliang 1 year ago
parent
commit
65039c4577

+ 1 - 1
cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/controller/StudentController.java

@@ -120,7 +120,7 @@ public class StudentController extends BaseController {
             List<String> studentPhones =
             List<String> studentPhones =
                     rows.stream().map(StudentVo::getPhone).filter(StringUtils::isNotEmpty).collect(Collectors.toList());
                     rows.stream().map(StudentVo::getPhone).filter(StringUtils::isNotEmpty).collect(Collectors.toList());
             groupByPhone = tenantActivationCodeService.lambdaQuery()
             groupByPhone = tenantActivationCodeService.lambdaQuery()
-                    .eq(TenantActivationCode::getId, query.getTenantAlbumPurchaseId())
+                    .eq(TenantActivationCode::getTenantAlbumPurchaseId, query.getTenantAlbumPurchaseId())
                     .in(TenantActivationCode::getActivationPhone, studentPhones)
                     .in(TenantActivationCode::getActivationPhone, studentPhones)
                     .list().stream().collect(Collectors.groupingBy(TenantActivationCode::getActivationPhone));
                     .list().stream().collect(Collectors.groupingBy(TenantActivationCode::getActivationPhone));
         }
         }

+ 1 - 1
cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/StudentController.java

@@ -118,7 +118,7 @@ public class StudentController extends BaseController {
             List<String> studentPhones =
             List<String> studentPhones =
                     rows.stream().map(StudentVo::getPhone).filter(StringUtils::isNotEmpty).collect(Collectors.toList());
                     rows.stream().map(StudentVo::getPhone).filter(StringUtils::isNotEmpty).collect(Collectors.toList());
              groupByPhone = tenantActivationCodeService.lambdaQuery()
              groupByPhone = tenantActivationCodeService.lambdaQuery()
-                    .eq(TenantActivationCode::getId, query.getTenantAlbumPurchaseId())
+                    .eq(TenantActivationCode::getTenantAlbumPurchaseId, query.getTenantAlbumPurchaseId())
                     .in(TenantActivationCode::getActivationPhone, studentPhones)
                     .in(TenantActivationCode::getActivationPhone, studentPhones)
                     .list().stream().collect(Collectors.groupingBy(TenantActivationCode::getActivationPhone));
                     .list().stream().collect(Collectors.groupingBy(TenantActivationCode::getActivationPhone));
         }
         }