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/TEmployeeProjectServiceImpl.java

@@ -114,7 +114,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 			if (CommonConstants.dingleDigitIntArray[1] == employeeProject.getProjectStatus()) {
 				if (!Common.isEmpty(tEmployeeInfo)) {
 					map.put("empProId",tEmployeeProject.getId());
-					if (CommonConstants.STATUS_NORMAL.equals(tEmployeeInfo.getFileStatus())) {
+					if (CommonConstants.dingleDigitIntArray[0] == tEmployeeInfo.getFileStatus()) {
 						return new R<>(CommonConstants.dingleDigitIntArray[4],"该人员已减项，是否“复项”",map);
 					} else {
 						map.put("employeeId", tEmployeeInfo.getId());
@@ -132,7 +132,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 				return R.failed("该人员暂无档案信息，禁止关联项目，如要添加，请先至“在档人员”处建档");
 			}
 			//判断是否已经减档
-			if (CommonConstants.ONE_STRING.equals(tEmployeeInfo.getFileStatus())) {
+			if (tEmployeeInfo.getFileStatus() == CommonConstants.dingleDigitIntArray[1]) {
 				map.put("employeeId", tEmployeeInfo.getId());
 				return new R<>(CommonConstants.dingleDigitIntArray[3],"该人员在离职库已存在，是否“恢复档案”",map);
 			}