|
@@ -322,7 +322,7 @@ class InstitutionService:
|
|
|
from app.plugin.module_payment.employee.model import EmployeeModel
|
|
from app.plugin.module_payment.employee.model import EmployeeModel
|
|
|
emp_stmt = select(EmployeeModel).where(
|
|
emp_stmt = select(EmployeeModel).where(
|
|
|
EmployeeModel.enterprise_id == enterprise_id,
|
|
EmployeeModel.enterprise_id == enterprise_id,
|
|
|
- EmployeeModel.status.in_(["EMPLOYEE_CREATE", "EMPLOYEE_ACTIVATED"]),
|
|
|
|
|
|
|
+ EmployeeModel.status != "EMPLOYEE_UNSIGN",
|
|
|
)
|
|
)
|
|
|
emp_result = await auth.db.execute(emp_stmt)
|
|
emp_result = await auth.db.execute(emp_stmt)
|
|
|
employee_ids = [emp.employee_id for emp in emp_result.scalars().all() if emp.employee_id]
|
|
employee_ids = [emp.employee_id for emp in emp_result.scalars().all() if emp.employee_id]
|
|
@@ -334,7 +334,7 @@ class InstitutionService:
|
|
|
from app.plugin.module_payment.employee.model import EmployeeModel
|
|
from app.plugin.module_payment.employee.model import EmployeeModel
|
|
|
emp_stmt = select(EmployeeModel).where(
|
|
emp_stmt = select(EmployeeModel).where(
|
|
|
EmployeeModel.enterprise_id == enterprise_id,
|
|
EmployeeModel.enterprise_id == enterprise_id,
|
|
|
- EmployeeModel.status.in_(["EMPLOYEE_CREATE", "EMPLOYEE_ACTIVATED"]),
|
|
|
|
|
|
|
+ EmployeeModel.status != "EMPLOYEE_UNSIGN",
|
|
|
)
|
|
)
|
|
|
emp_result = await auth.db.execute(emp_stmt)
|
|
emp_result = await auth.db.execute(emp_stmt)
|
|
|
for emp in emp_result.scalars().all():
|
|
for emp in emp_result.scalars().all():
|