Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!462

src/main/java/cn/timer/api/controller/crm/CrmController.java

@@ -1395,7 +1395,7 @@ public class CrmController {
 		reader.addHeaderAlias("邮箱", "clientEmail");
 		reader.addHeaderAlias("邮箱", "clientEmail");
 		reader.addHeaderAlias("地址", "address");
 		reader.addHeaderAlias("地址", "address");
 		reader.addHeaderAlias("联系人姓名", "linkName");
 		reader.addHeaderAlias("联系人姓名", "linkName");
-		reader.addHeaderAlias("手机号码(联系人)", "cellphone");
+		reader.addHeaderAlias("手机号码", "cellphone");
 		reader.addHeaderAlias("所属公司", "company");
 		reader.addHeaderAlias("所属公司", "company");
 		reader.addHeaderAlias("性别", "gender");
 		reader.addHeaderAlias("性别", "gender");
 		reader.addHeaderAlias("职位", "position");
 		reader.addHeaderAlias("职位", "position");
@@ -1414,11 +1414,8 @@ public class CrmController {
 			String clientUrl = crmClientDataImportVo.getClientUrl(); // 官网
 			String clientUrl = crmClientDataImportVo.getClientUrl(); // 官网
 			String clientEmail = crmClientDataImportVo.getClientEmail(); // 邮箱
 			String clientEmail = crmClientDataImportVo.getClientEmail(); // 邮箱
 			String clientAddress = crmClientDataImportVo.getAddress(); // 地址
 			String clientAddress = crmClientDataImportVo.getAddress(); // 地址
-			
 			String wechat = crmClientDataImportVo.getWechat(); // 微信
 			String wechat = crmClientDataImportVo.getWechat(); // 微信
 			String product = crmClientDataImportVo.getProduct(); // 产品
 			String product = crmClientDataImportVo.getProduct(); // 产品
-			
-
 			String linkname = crmClientDataImportVo.getLinkName(); // 联系人姓名
 			String linkname = crmClientDataImportVo.getLinkName(); // 联系人姓名
 			String linkcellphone = crmClientDataImportVo.getCellphone(); // 手机号码
 			String linkcellphone = crmClientDataImportVo.getCellphone(); // 手机号码
 			String linkcompany = crmClientDataImportVo.getCompany(); // 所属公司
 			String linkcompany = crmClientDataImportVo.getCompany(); // 所属公司
@@ -1458,7 +1455,9 @@ public class CrmController {
 			}
 			}
 
 
 			crmClientData.setClientStatus(1);
 			crmClientData.setClientStatus(1);
+			if(linkname != null) {
 				crmClientData.setContactsNum(1);
 				crmClientData.setContactsNum(1);
+			}
 			crmClientData.setBelongUser(empNum);
 			crmClientData.setBelongUser(empNum);
 			crmClientData.setBelongUserName(getEmpName(orgCode, empNum));
 			crmClientData.setBelongUserName(getEmpName(orgCode, empNum));
 			crmClientData.setClientName(clientName);
 			crmClientData.setClientName(clientName);
@@ -1481,7 +1480,7 @@ public class CrmController {
 
 
 			Integer cid = crmClientData.getId();
 			Integer cid = crmClientData.getId();
 			
 			
-			if(linkname != null && linkcellphone != null) {
+			if(linkname != null) {
 				CrmClientContacts contacts = new CrmClientContacts();
 				CrmClientContacts contacts = new CrmClientContacts();
 				contacts.setName(linkname);
 				contacts.setName(linkname);
 				contacts.setCellphone(linkcellphone);
 				contacts.setCellphone(linkcellphone);