Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!278

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

@@ -407,11 +407,15 @@ public class CrmController {
 			CrmClientAssociate.builder().cid(crmDataId).associateId(id).orgCode(getOrgCode(userBean)).build().insert();
 			CrmClientAssociate.builder().cid(crmDataId).associateId(id).orgCode(getOrgCode(userBean)).build().insert();
 		}
 		}
 		List<CrmClientContacts> crmClientContacts = crmClientData.getCrmClientContacts();
 		List<CrmClientContacts> crmClientContacts = crmClientData.getCrmClientContacts();
+		int contactsnum = 0;
 		for (CrmClientContacts crmClientContact : crmClientContacts) {
 		for (CrmClientContacts crmClientContact : crmClientContacts) {
+			if(crmClientContact.getName() != null) {
 				crmClientContact.setCid(crmDataId);
 				crmClientContact.setCid(crmDataId);
 				crmClientContact.insert();
 				crmClientContact.insert();
+				contactsnum++;
 			}
 			}
-		crmClientData.setContactsNum(crmClientContacts.size());
+		}
+		crmClientData.setContactsNum(contactsnum);
 		crmClientData.updateById();
 		crmClientData.updateById();
 		return ResultUtil.success("新增成功");
 		return ResultUtil.success("新增成功");
 	}
 	}