huyc 项目档案代码提交

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeProjectUpdateVO.java

@@ -115,7 +115,7 @@ public class EmployeeProjectUpdateVO extends RowIndex implements Serializable {
     /**
      * 入职日期
      */
-	@ExcelAttribute(name = "入职日期",maxLength = 4)
+	@ExcelAttribute(name = "入职日期")
 	@ExcelProperty(value ="入职日期")
 	@Past
 	@DateTimeFormat("yyyy-MM-dd")

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

@@ -660,6 +660,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 			if (CollUtil.isEmpty(errorMessageList)) {
 
 				updateExcelProj(excel, updateList, tEmployeeProject);
+				if (Common.isNotNull(excel.getEmpNatrue())) {
 					if (!excel.getEmpNatrue().equals(tEmployeeProject.getEmpNatrue())) {
 						TEmployeeInfo tEmployeeInfo = tEmployeeInfoMapper.selectOne(Wrappers.<TEmployeeInfo>query().lambda()
 								.eq(TEmployeeInfo::getEmpIdcard, excel.getEmpIdcard())
@@ -679,6 +680,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 					}
 				}
 			}
+		}
 		try {
 			if (updateList.size() > CommonConstants.dingleDigitIntArray[0]) {
 				baseMapper.updateExcelEmpProject(updateList);