mirror of
https://github.com/jxxghp/MoviePilot.git
synced 2026-09-05 15:38:19 +08:00
fix(site): avoid err_msg cannot be updated when it's None
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
from datetime import datetime
|
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 sqlalchemy.orm import Session
|
||||||
|
|
||||||
from app.db import db_query, Base
|
from app.db import db_query, Base
|
||||||
@@ -81,7 +81,7 @@ class SiteUserData(Base):
|
|||||||
func.max(SiteUserData.updated_day).label('latest_update_day')
|
func.max(SiteUserData.updated_day).label('latest_update_day')
|
||||||
)
|
)
|
||||||
.group_by(SiteUserData.domain)
|
.group_by(SiteUserData.domain)
|
||||||
.filter(SiteUserData.err_msg.is_(None))
|
.filter(or_(SiteUserData.err_msg.is_(None), SiteUserData.err_msg == ""))
|
||||||
.subquery()
|
.subquery()
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
+2
-1
@@ -114,7 +114,8 @@ class SiteOper(DbOper):
|
|||||||
"domain": domain,
|
"domain": domain,
|
||||||
"name": name,
|
"name": name,
|
||||||
"updated_day": current_day,
|
"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)
|
siteuserdatas = SiteUserData.get_by_domain(self._db, domain=domain, workdate=current_day)
|
||||||
|
|||||||
Reference in New Issue
Block a user