Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!293

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

@@ -435,7 +435,8 @@ public class CrmController {
 		List<CrmClientContacts> crmClientContacts = crmClientData.getCrmClientContacts();
 		List<CrmClientContacts> crmClientContacts = crmClientData.getCrmClientContacts();
 		if (crmClientContacts != null) {
 		if (crmClientContacts != null) {
 			for (CrmClientContacts crmClientContact : crmClientContacts) {
 			for (CrmClientContacts crmClientContact : crmClientContacts) {
-				crmClientContact.updateById();
+//				crmClientContact.updateById();
+				crmClientContact.insertOrUpdate();
 			}
 			}
 		}
 		}
 		List<CrmClientAssociate> oldAssociates = CrmClientAssociate.builder().build()
 		List<CrmClientAssociate> oldAssociates = CrmClientAssociate.builder().build()

src/main/java/cn/timer/api/utils/router/business/TransferPositionBusiness.java

@@ -38,8 +38,12 @@ public class TransferPositionBusiness extends SpmkAssoBusiness {
 		String ReasonForApplication = ObjectUtil.isNull(jsonObj.get("__ReasonForApplication",FromData.class)) ? null : jsonObj.get("__ReasonForApplication",FromData.class).getValue();
 		String ReasonForApplication = ObjectUtil.isNull(jsonObj.get("__ReasonForApplication",FromData.class)) ? null : jsonObj.get("__ReasonForApplication",FromData.class).getValue();
 		// 调入部门
 		// 调入部门
 		Integer TransferInDepartment = ObjectUtil.isNull(jsonObj.get("__TransferInDepartment",FromData.class)) ? null : Convert.toInt(jsonObj.get("__TransferInDepartment",FromData.class).getValue());
 		Integer TransferInDepartment = ObjectUtil.isNull(jsonObj.get("__TransferInDepartment",FromData.class)) ? null : Convert.toInt(jsonObj.get("__TransferInDepartment",FromData.class).getValue());
+		
+		if(!("").equals(jsonObj.get("__TransferInPosition",FromData.class).getValue())) {
 			// 调入岗位
 			// 调入岗位
 			Integer TransferInPosition = ObjectUtil.isNull(jsonObj.get("__TransferInPosition",FromData.class)) ? null : Integer.parseInt(jsonObj.get("__TransferInPosition",FromData.class).getValue());
 			Integer TransferInPosition = ObjectUtil.isNull(jsonObj.get("__TransferInPosition",FromData.class)) ? null : Integer.parseInt(jsonObj.get("__TransferInPosition",FromData.class).getValue());
+		}
+		
 		if (TransferInDepartment == null) {
 		if (TransferInDepartment == null) {
 			throw new CustomException("部门或岗位 未填写,审批失败");
 			throw new CustomException("部门或岗位 未填写,审批失败");
 		}
 		}