diff --git a/app/db/models/siteuserdata.py b/app/db/models/siteuserdata.py index e2f13e8d..3c97ded0 100644 --- a/app/db/models/siteuserdata.py +++ b/app/db/models/siteuserdata.py @@ -1,6 +1,6 @@ from datetime import datetime -from sqlalchemy import Column, Integer, String, Sequence, Float, JSON, func +from sqlalchemy import Column, Integer, String, Sequence, Float, JSON, func, or_ from sqlalchemy.orm import Session from app.db import db_query, Base @@ -81,7 +81,7 @@ class SiteUserData(Base): func.max(SiteUserData.updated_day).label('latest_update_day') ) .group_by(SiteUserData.domain) - .filter(SiteUserData.err_msg.is_(None)) + .filter(or_(SiteUserData.err_msg.is_(None), SiteUserData.err_msg == "")) .subquery() ) diff --git a/app/db/site_oper.py b/app/db/site_oper.py index 5b7c1410..42ec3564 100644 --- a/app/db/site_oper.py +++ b/app/db/site_oper.py @@ -114,7 +114,8 @@ class SiteOper(DbOper): "domain": domain, "name": name, "updated_day": current_day, - "updated_time": current_time + "updated_time": current_time, + "err_msg": payload.get("err_msg") or "" }) # 按站点+天判断是否存在数据 siteuserdatas = SiteUserData.get_by_domain(self._db, domain=domain, workdate=current_day)