From dbaba7913cc8000e601dbc624fd32be21e75856d Mon Sep 17 00:00:00 2001
From: "weiye.wang" <kj_wangweiye@126.com>
Date: Tue, 26 Mar 2024 23:24:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E5=A4=84=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BD=BF=E7=94=A8=E8=AE=B0=E5=BD=952024=E7=9A=84bug,?=
 =?UTF-8?q?=20=E5=B9=B6=E5=B0=86=E5=AF=BC=E5=85=A5=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=B7=BB=E5=8A=A0=E4=BD=BF=E7=94=A8=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=88=87=E6=8D=A2=E5=88=B02024=E6=96=B0=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 工具v2/database_tools.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/工具v2/database_tools.py b/工具v2/database_tools.py
index a7445fd1..f1e3a366 100644
--- a/工具v2/database_tools.py
+++ b/工具v2/database_tools.py
@@ -674,12 +674,14 @@ def AppendUsageData2024(prodict,field_id_and_content):
                         print(f"######班级 {usage['classid']} 在题号为 {id} 的题目处已有非常类似的使用记录, 不作记录")
                         importflag = False
                         break
-                    elif usage["classid"] == oldusage["classid"]:
-                        print(f"!!!!!!班级 {usage['classid']} 在题号为 {id} 的题目处已有使用记录, 在pending list中记录")
-                        oldinfo = [v for v in prodict[id][field] if usage['classid'] in v]
-                        pending_list = pending_list + [(id,line,oldinfo)]
-                        importflag = False
-                        break
+                if importflag:
+                    for u in oldusages:
+                        if usage["classid"] == oldusage["classid"]:
+                            print(f"!!!!!!班级 {usage['classid']} 在题号为 {id} 的题目处已有使用记录, 在pending list中记录")
+                            oldinfo = [v for v in prodict[id][field] if usage['classid'] in v]
+                            pending_list = pending_list + [(id,line,oldinfo)]
+                            importflag = False
+                            break
                 if importflag:
                     prodict[id][field].append(line)
                     print(f"已于 {id} 的 {field} 字段执行添加, 内容为 {line}")
@@ -715,7 +717,7 @@ def ImportMetadata(prodict,objdict,fieldsdict,metadatafilepath,pendingdatafilepa
             elif method == "objappend":
                 feedback = AppendObjData(prodict,objdict,item)
             elif method == "usageappend":
-                feedback = AppendUsageData(prodict,item)
+                feedback = AppendUsageData2024(prodict,item)
                 outputstring += feedback[3]
             elif method == "fixed":
                 print("字段 %s 不可按此方式修改"%field)