From 14d5f5aac6a7693c3b87d5461d62d2033a94848e Mon Sep 17 00:00:00 2001
From: yechenhao <yechenhao>
Date: Thu, 14 May 2020 13:57:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/kiisoo/ic/customer/CustomerService.java      | 3 ++-
 .../java/com/kiisoo/ic/employee/service/EmployeeService.java   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java
index a0923dd..f0514c7 100644
--- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java
+++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java
@@ -168,7 +168,7 @@ public class CustomerService {
      */
     public void turnBack(TurnBackDTO turnBackDTOS) throws Exception {
         OpCustomer opCustomer = null;
-        if (turnBackDTOS.getWxData().getUnionId() == null && turnBackDTOS.getWxData().getUserId() == null) {
+        if (turnBackDTOS.getWxData().getUnionId() == null && turnBackDTOS.getWxData().getUserId() != null) {
             //此时说明是企业微信扫码添加
             QueryWrapper<OpCustomer> customerWrapper = new QueryWrapper<>();
             customerWrapper.eq("wechat_uni_id", null).eq("external_userid", turnBackDTOS.getWxData().getUserId()).last("limit 1");
@@ -206,6 +206,7 @@ public class CustomerService {
         OpCustomer insertCustomer = new OpCustomer();
         insertCustomer.setWechatUniId(turnBackDTOS.getWxData().getUnionId());
         insertCustomer.setName(turnBackDTOS.getName());
+        insertCustomer.setType(new Long(turnBackDTOS.getType()));
         insertCustomer.setAvatarUrl(turnBackDTOS.getWxData().getAvatarUrl());
         insertCustomer.setExternalUserid(turnBackDTOS.getWxData().getUserId());
         insertCustomer.setCpUserId(turnBackDTOS.getUserId());
diff --git a/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java b/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java
index 956d3d7..201d99c 100644
--- a/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java
+++ b/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java
@@ -627,7 +627,7 @@ public class EmployeeService {
                         }
                     }
 
-                    turnBackDTO.setType(1);
+                    turnBackDTO.setType(externalContact.getType());
                     turnBackDTO.setUserId(cpUserId);
                     turnBackDTO.setName(externalContact.getName());
                     WxDataDTO wxDataDTO = new WxDataDTO();