Merge remote-tracking branch 'origin/develop' into develop

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java

@@ -1020,6 +1020,20 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 				} else {
 					saveEmp = existEmpMap.get(excel.getEmpIdcard());
 					saveEmp.setProjectNum(CommonConstants.ONE_INT);
+					if (Common.isNotNull(excel.getDeptNo())) {
+						if (excel.getDeptNo().length() > 20) {
+							errorMsg.add(EmployeeConstants.DEPT_NO_LENGTH);
+						} else {
+							saveEmp.setDeptNo(excel.getDeptNo());
+						}
+					}
+					if (Common.isNotNull(excel.getPost())) {
+						if (excel.getPost().length() > 20) {
+							errorMsg.add(EmployeeConstants.POST_LENGTH);
+						} else {
+							saveEmp.setPost(excel.getPost());
+						}
+					}
 					saveList.add(saveEmp);
 				}
 			} else {
@@ -1329,6 +1343,9 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 						project.setProjectStatus(CommonConstants.ZERO_INT);
 					}
 					tEmployeeProjectService.updateBatchById(projectList);
+				} else {
+					// 新增项目档案
+					tEmployeeProjectService.saveEmployeeProjectInfo(employeeInfo);
 				}
 			}
 		}