gskh
/
approval
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

This commit is contained in:
Marsway 2026-02-04 14:47:27 +08:00
parent 490e537483
commit 17c276a47b
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/services/huobanyun_service.py
View File

@ -78,7 +78,7 @@ class HuobanyunService:
fields: Dict[str, Any] = {} fields: Dict[str, Any] = {}
if payment_type == "对公付款": if payment_type == "对公付款":
fields[self._resolve_field_key("是否已关联对公付款审批")] = True fields[self._resolve_field_key("是否已关联对公付款审批")] = True
if payment_type == "对私付款": if payment_type in {"对私付款", "服务费"}:
fields[self._resolve_field_key("是否已关联对私付款审批")] = True fields[self._resolve_field_key("是否已关联对私付款审批")] = True
if not fields: if not fields:
return return
@ -232,16 +232,8 @@ class HuobanyunService:
if isinstance(token_key, str): if isinstance(token_key, str):
if token_key.startswith("对公"): if token_key.startswith("对公"):
approval_hint = "public" approval_hint = "public"
if self._resolve_field_key(token_key) == token_key:
key = token_key.replace("对公", "", 1)
else:
key = token_key
elif token_key.startswith("对私"): elif token_key.startswith("对私"):
approval_hint = "private" approval_hint = "private"
if self._resolve_field_key(token_key) == token_key:
key = token_key.replace("对私", "", 1)
else:
key = token_key
key = self._resolve_field_key(str(key).strip()) if key else "" key = self._resolve_field_key(str(key).strip()) if key else ""
query_value = req.query or req.keyword or "" query_value = req.query or req.keyword or ""
linkage_params = req.linkage_params or raw.get("linkage_params") or {} linkage_params = req.linkage_params or raw.get("linkage_params") or {}
@ -265,7 +257,7 @@ class HuobanyunService:
"query": {"eq": False}, "query": {"eq": False},
} }
) )
if payment_type == "对私付款" or approval_hint == "private": if payment_type in {"对私付款", "服务费"} or approval_hint == "private":
base_filters.append( base_filters.append(
{ {
"field": self._resolve_field_key("是否已关联对私付款审批"), "field": self._resolve_field_key("是否已关联对私付款审批"),