身份证唯一

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TSalaryEmployeeUpdateVo.java

@@ -69,9 +69,8 @@ public class TSalaryEmployeeUpdateVo extends RowIndex implements Serializable {
 	/**
 	 * 项目编码
 	 */
-	@NotBlank(message = "项目编码 不能为空")
 	@Length(max = 30, message = "项目编码 不能超过30 个字符")
-	@ExcelAttribute(name = "项目编码", isNotEmpty = true, errorInfo = "项目编码 不能为空", maxLength = 30)
+	@ExcelAttribute(name = "项目编码", maxLength = 30)
 	@Schema(description = "项目编码")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("项目编码")

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java

@@ -327,7 +327,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 				}
 			}
 		}
-		if (!notLabour) {
+		if (notLabour) {
 			this.save(employee);
 		}
 		return null;
@@ -478,6 +478,9 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 						if (Common.isNotNull(excel.getEmpPhone())) {
 							emp.setEmpPhone(excel.getEmpPhone());
 						}
+						if (Common.isNotNull(excel.getEmpName())) {
+							emp.setEmpName(excel.getEmpName());
+						}
 						baseMapper.updateById(emp);
 						if (curTaxMonth) {
 							errorMessageList.add(new ErrorMessage(excel.getRowIndex(), SalaryConstants.CUR_TAX_INFO));