From 519930bc1112cdf7881fecce907381ce6374e74c Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 14 一月 2025 13:37:56 +0800
Subject: [PATCH] 文档出卷-未上传文件提示
---
app/service/dialog.py | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/app/service/dialog.py b/app/service/dialog.py
index bfc1fc0..0e79270 100644
--- a/app/service/dialog.py
+++ b/app/service/dialog.py
@@ -13,7 +13,11 @@
user = db.query(UserModel).filter(UserModel.id == user_id).first()
if user is None:
return {"rows": []}
- query = db.query(DialogModel).filter(DialogModel.status != Dialog_STATSU_DELETE)
+ query = db.query(DialogModel)
+ if status:
+ query = query.filter(DialogModel.status == status)
+ else:
+ query = query.filter(DialogModel.status != Dialog_STATSU_DELETE)
id_list = []
if label:
id_list = [i.object_id for i in db.query(LabelWorkerModel).filter(LabelWorkerModel.label_id==label).all()]
@@ -27,9 +31,7 @@
if keyword:
query = query.filter(DialogModel.name.like('%{}%'.format(keyword)))
- if status:
- # print(status)
- query = query.filter(DialogModel.status == status)
+
query = query.order_by(DialogModel.update_date.desc())
total = query.count()
if page_size:
--
Gitblit v1.8.0