Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!467

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

@@ -1467,7 +1467,7 @@ public class CrmController {
 			}
 
 			crmClientData.setClientStatus(1);
-			if(!("").equals(linkname) && linkname != null) {
+			if(!("").equals(linkname) && linkname != null || !("").equals(linkcellphone) && linkcellphone != null) {
 				crmClientData.setContactsNum(1);
 			}
 			crmClientData.setBelongUser(empNum);
@@ -1492,7 +1492,7 @@ public class CrmController {
 
 			Integer cid = crmClientData.getId();
 			
-			if(!("").equals(linkname) && linkname != null) {
+			if(!("").equals(linkname) && linkname != null || !("").equals(linkcellphone) && linkcellphone != null) {
 				CrmClientContacts contacts = new CrmClientContacts();
 				contacts.setName(linkname);
 				contacts.setCellphone(linkcellphone);