From 61e7073f560dbf41d9d2433d6766f2a34e7d4912 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmial.com>
Date: Tue, 13 Apr 2021 22:17:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=97=B6=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E5=85=AC=E5=8F=B8=E5=8F=98=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test_mini/app.js                               |  4 ++--
 .../crm/migrations/0028_auto_20210413_2207.py  | 18 ++++++++++++++++++
 test_server/crm/views.py                       |  3 ++-
 3 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 test_server/crm/migrations/0028_auto_20210413_2207.py

diff --git a/test_mini/app.js b/test_mini/app.js
index 05eae33..614fe1f 100644
--- a/test_mini/app.js
+++ b/test_mini/app.js
@@ -70,9 +70,9 @@ App({
   globalData: {
     userInfo: {},
     userinfo: {}, // 服务器传回的消费者信息
-    //host: 'https://apitest.ahctc.cn',
+    host: 'https://apitest.ahctc.cn',
     mediahost: 'https://apitest.ahctc.cn',
-    host: 'http://127.0.0.1:8000',
+    //host: 'http://127.0.0.1:8000',
     //mediahost: 'http://127.0.0.1:8000',
     token : '',
   }
diff --git a/test_server/crm/migrations/0028_auto_20210413_2207.py b/test_server/crm/migrations/0028_auto_20210413_2207.py
new file mode 100644
index 0000000..c7921a3
--- /dev/null
+++ b/test_server/crm/migrations/0028_auto_20210413_2207.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.4 on 2021-04-13 14:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('crm', '0027_consumer_deptname'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='company',
+            name='name',
+            field=models.CharField(max_length=60, verbose_name='名称'),
+        ),
+    ]
diff --git a/test_server/crm/views.py b/test_server/crm/views.py
index 82287a1..d75ab2f 100644
--- a/test_server/crm/views.py
+++ b/test_server/crm/views.py
@@ -459,7 +459,8 @@ class ConsumerViewSet(ModelViewSet):
                 obj.username = username
                 obj.create_admin = request.user
             obj.name = name
-            obj.company = companyobj
+            if not obj.company: #导入时避免公司变动
+                obj.company = companyobj
             if ID_number1:
                 obj.ID_number1 = ID_number1
             obj.save()