|
|
@@ -1139,15 +1139,15 @@ export class DisabledPersonService extends GenericCrudService<DisabledPerson> {
|
|
|
unionConditions.push('order.platformId = :platformId');
|
|
|
parameters.platformId = platformId;
|
|
|
}
|
|
|
- if (companyName) {
|
|
|
- unionConditions.push('company.companyName LIKE :companyName');
|
|
|
- parameters.companyName = `%${companyName}%`;
|
|
|
- }
|
|
|
|
|
|
if (unionConditions.length > 0) {
|
|
|
countQueryBuilder.andWhere(`(${unionConditions.join(' OR ')})`, parameters);
|
|
|
}
|
|
|
}
|
|
|
+ // 公司名称筛选:使用 AND 逻辑(独立筛选条件,与主查询保持一致)
|
|
|
+ if (companyName) {
|
|
|
+ countQueryBuilder.andWhere('company.companyName LIKE :companyName', { companyName: `%${companyName}%` });
|
|
|
+ }
|
|
|
|
|
|
if (gender) {
|
|
|
countQueryBuilder.andWhere('person.gender = :gender', { gender });
|