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

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeProjectController.java

@@ -159,7 +159,6 @@ public class TEmployeeProjectController {
 	@Operation(summary = "复档复项相关操作", description = "复档复项相关操作")
 	@SysLog("复档复项相关操作" )
 	@PostMapping("/reEmpInfo")
-	@PreAuthorize("@pms.hasPermission('archives_temployeeproject_reempinfo')" )
 	public R reEmpInfo(@RequestBody JSONObject jsonObject) {
 		return tEmployeeProjectService.reEmpInfo(jsonObject);
 	}
@@ -196,7 +195,8 @@ public class TEmployeeProjectController {
 	/**
 	 * 批量新增项目档案信息
 	 *
-	 * @param excelVOList
+	 * @param file
+	 * @param idAdd
 	 * @return R<List>
 	 * @Author huyc
 	 * @Date 2022-06-20
@@ -212,8 +212,7 @@ public class TEmployeeProjectController {
 
 	/**
 	 * 批量更新项目档案信息
-	 * @param excelVOList
-	 * @param bindingResult
+	 * @param file
 	 * @return R<List>
 	 * @Author huyc
 	 * @Date 2022-06-21

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

@@ -368,7 +368,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 			//不存在复档或复项的情况
 			//档案无（在档人员、离职库皆无），项目无
 			if (Common.isEmpty(tEmployeeInfo) && Common.isEmpty(tEmployeeProject)) {
-				errorMsg.add(MsgUtils.getMessage(ErrorCodes.CHECKS_REDUCE_EMP_ERROR));
+				errorMessageList.add(new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.CHECKS_EXIT_EMPPROJECT_ERROR)));
 
 				//档案有（在档人员），项目无
 			} else if (Common.isNotNull(tEmployeeInfo) && Common.isEmpty(tEmployeeProject)