新增薪资服务

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java

@@ -2096,16 +2096,22 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		Map<String, TSocialFundInfo> socialFundMap = getSocialFundMap(idcards);
 		// 获取项目编码数据 以供校验
 		Map<String, ProjectSetInfoVo> projectVoMap = getProjectVoMap(codes);
-		DispatchEmpVo empVo = null;
+		DispatchEmpVo empVo;
 		TDispatchInfo dispatch;
 		TDispatchReduceVo excel;
 		TSocialFundInfo socialFund;
-		ProjectSetInfoVo setInfoVo = null;
+		ProjectSetInfoVo setInfoVo;
 		// 执行数据插入操作 组装
 		for (int i = 0; i < excelVOList.size(); i++) {
+			socialFund = null;
+			setInfoVo= null;
+			empVo= null;
+			dispatch= null;
 			excel = excelVOList.get(i);
 			setInfoVo = getSetInfoVo(projectVoMap,excel.getDepartNo());
-			socialFund = socialFundMap.get(excel.getEmpIdcard());
+			if (Common.isNotNull(socialFundMap)){
+				socialFund = socialFundMap.get(excel.getEmpIdcard());
+			}
 			if (Common.isEmpty(setInfoVo)){
 				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_PROJECT_NOT_FOUND)));
 				continue;