账号新增cl_name字段,底层搜索新增account_id的[]类型in搜索
This commit is contained in:
@@ -58,7 +58,11 @@ class BaseService(Generic[ModelType]):
|
||||
for field_name, field_value in conditions.items():
|
||||
if hasattr(self.model, field_name) and field_value is not None:
|
||||
field = getattr(self.model, field_name)
|
||||
if isinstance(field_value, str):
|
||||
if field_name == 'account_id':
|
||||
if not isinstance(field_value, (list, tuple)):
|
||||
field_value = [field_value]
|
||||
query = query.filter(field.in_(field_value))
|
||||
elif isinstance(field_value, str):
|
||||
query = query.filter(field.like(f"{field_value}"))
|
||||
else:
|
||||
query = query.filter(field == field_value)
|
||||
@@ -73,7 +77,11 @@ class BaseService(Generic[ModelType]):
|
||||
for field_name, field_value in conditions.items():
|
||||
if hasattr(self.model, field_name) and field_value is not None:
|
||||
field = getattr(self.model, field_name)
|
||||
if isinstance(field_value, str):
|
||||
if field_name == 'account_id':
|
||||
if not isinstance(field_value, (list, tuple)):
|
||||
field_value = [field_value]
|
||||
query = query.filter(field.in_(field_value))
|
||||
elif isinstance(field_value, str):
|
||||
query = query.filter(field.like(f"{field_value}"))
|
||||
else:
|
||||
query = query.filter(field == field_value)
|
||||
|
||||
Reference in New Issue
Block a user