From 2f84e3cc4bff981590ab37bd95da64bd72c1f2e0 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期一, 16 十二月 2024 09:40:00 +0800
Subject: [PATCH] 12-16
---
app/service/label.py | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/app/service/label.py b/app/service/label.py
index 54448b5..3e52196 100644
--- a/app/service/label.py
+++ b/app/service/label.py
@@ -1,18 +1,19 @@
import uuid
-from streamlit.time_util import adjust_years
-
from Log import logger
from app.models.label_model import LabelModel, LabelWorkerModel
from app.models.role_model import RoleModel
-async def label_list_service(db, keyword: str, label_type):
+async def label_list_service(db, keyword: str, label_type, object_id):
query = db.query(LabelModel)
if keyword:
query = query.filter(LabelModel.name.like('%{}%'.format(keyword)))
if label_type:
query = query.filter(LabelModel.label_type==label_type)
+ if object_id:
+ label_id = [i.label_id for i in db.query(LabelWorkerModel).filter(LabelWorkerModel.object_id==object_id).all()]
+ query = query.filter(LabelModel.id.in_(label_id))
labels = query.order_by(LabelModel.id.desc()).all()
return {"total": query.count(), "rows": [label.to_json() for label in labels]}
@@ -61,4 +62,10 @@
logger.error(e)
db.rollback()
# return False
+ for label_id in delete_list:
+ try:
+ LabelWorkerModel(label_id=label_id, object_id=object_id).delete()
+ except Exception as e:
+ logger.error(e)
+ db.rollback()
return True
\ No newline at end of file
--
Gitblit v1.8.0