From 6cd0b0f6261a9880dd40c84aa10cf88dbc4516b1 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 9 Mar 2020 11:04:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=AF=95=E9=A2=98=20?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=20=E6=9C=AA=E5=88=A0=E9=99=A4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 safesite/daoru.py                             |  4 +--
 .../migrations/0322_auto_20200305_1411.py     | 27 +++++++++++++++++++
 safesite/models.py                            |  4 +--
 3 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 safesite/migrations/0322_auto_20200305_1411.py

diff --git a/safesite/daoru.py b/safesite/daoru.py
index 5ad38647..4cdba4f6 100644
--- a/safesite/daoru.py
+++ b/safesite/daoru.py
@@ -84,11 +84,11 @@ def drquestions(companyid,path,userid):
         right = sheet['j'+str(i)].value.replace(' ', '')
         resolution = sheet['k'+str(i)].value
         level = sheet['l'+str(i)].value
-        objs = Questioncat.objects.filter(usecomp__partid=1,name=cate)
+        objs = Questioncat.objects.filter(usecomp__partid=1,name=cate,deletemark=1)
         if objs.exists():
             cateobj = objs[0]
         else:
-            objs = Questioncat.objects.filter(usecomp__partid=companyid,name=cate)
+            objs = Questioncat.objects.filter(usecomp__partid=companyid,name=cate,deletemark=1)
             if objs.exists():
                 cateobj = objs[0]
             else:
diff --git a/safesite/migrations/0322_auto_20200305_1411.py b/safesite/migrations/0322_auto_20200305_1411.py
new file mode 100644
index 00000000..d9b1e2dc
--- /dev/null
+++ b/safesite/migrations/0322_auto_20200305_1411.py
@@ -0,0 +1,27 @@
+# Generated by Django 2.2.8 on 2020-03-05 14:11
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('safesite', '0321_remove_companyinfo_liaison_fax'),
+    ]
+
+    operations = [
+        # migrations.RemoveField(
+        #     model_name='companyinfo',
+        #     name='liaison_fax',
+        # ),
+        migrations.AlterField(
+            model_name='examtestdetail',
+            name='tms',
+            field=models.TextField(default=','),
+        ),
+        migrations.AlterField(
+            model_name='examtestdetail',
+            name='wrongs',
+            field=models.TextField(default=','),
+        ),
+    ]
diff --git a/safesite/models.py b/safesite/models.py
index da2e1b1f..ff5b5d17 100644
--- a/safesite/models.py
+++ b/safesite/models.py
@@ -774,8 +774,8 @@ class ExamTestDetail(models.Model):  # 考试详情表
     passcode = models.IntegerField(default=0)  # 是否通过
     testdetail = JSONField(null=True, blank=True)
     score = models.FloatField(default=0)  # 得分
-    tms = models.CharField(max_length=10000, default=',')
-    wrongs = models.CharField(max_length=10000, default=',')
+    tms = models.TextField(default=',')
+    wrongs = models.TextField(default=',')
 
 
 class Train(models.Model):  # 培训表