提交

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

@@ -1480,26 +1480,31 @@ public class CrmController {
 			crmClientData.insert();
 			crmClientData.insert();
 
 
 			Integer cid = crmClientData.getId();
 			Integer cid = crmClientData.getId();
-
-			CrmClientContacts contacts = new CrmClientContacts();
-			contacts.setName(linkname);
-			contacts.setCellphone(linkcellphone);
-			contacts.setCompany(linkcompany);
-			if (linkgender == "女")
-				contacts.setGender(0);
-			else if (linkgender == "男")
-				contacts.setGender(1);
-			else
-				contacts.setGender(null);
-			contacts.setPosition(linkposition);
-			contacts.setTelephone(linktelephone);
-			contacts.setEmail(linkemail);
-			contacts.setAddress(linkaddress);
-			if (!(linkname == null && linkcellphone == null && linkcompany == null && linkgender == null
-					&& linkposition == null && linktelephone == null && linkemail == null && linkaddress == null)) {
-				contacts.setCid(cid);
-				contacts.insert();
+			
+			if(linkname != null && linkcellphone != null) {
+				CrmClientContacts contacts = new CrmClientContacts();
+				contacts.setName(linkname);
+				contacts.setCellphone(linkcellphone);
+				contacts.setCompany(linkcompany);
+				if (("女").equals(linkgender))
+					contacts.setGender(0);
+				else if (("男").equals(linkgender))
+					contacts.setGender(1);
+				else
+					contacts.setGender(null);
+				contacts.setPosition(linkposition);
+				contacts.setTelephone(linktelephone);
+				contacts.setEmail(linkemail);
+				contacts.setAddress(linkaddress);
+				if (!(linkname == null && linkcellphone == null && linkcompany == null && linkgender == null
+						&& linkposition == null && linktelephone == null && linkemail == null && linkaddress == null)) {
+					contacts.setCid(cid);
+					contacts.insert();
+				}
 			}
 			}
+			
+			
+			
 		}
 		}
 		return ResultUtil.success("导入成功");
 		return ResultUtil.success("导入成功");
 	}
 	}