数据权限修改

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

@@ -634,13 +634,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 					} catch (Exception e) {
 			 			log.error("社保缴费库数据批量导入异常：" + e);
 						redisUtil.remove(key);
-					} finally {
-						paymentInfoPensionMap.clear();
-						paymentInfoBigMap.clear();
-						paymentInfoBirMap.clear();
-						paymentInfoMedicalMap.clear();
-						paymentInfoUnEmpMap.clear();
-						paymentInfoInjuryMap.clear();
 					}
 					// -----------------------------线程池处理list，批量保存社保信息结束--------------------------------
 					//最后一个推送
@@ -1168,7 +1161,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 
 	private void batchSavePaymentFundInfo(List<TPaymentInfoVo> list, List<ErrorMessage> errorMessageList) {
 
-		HashMap<String, String> areaMap = new HashMap<String, String>();
+		HashMap<String, String> areaMap = new HashMap<>();
 		R<AreaVo> areaListR = upmsDaprUtils.getAreaListR();
 		if (Common.isNotNull(areaListR)) {
 			AreaVo areaList = areaListR.getData();
@@ -1297,8 +1290,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 									+ "公积金缴费数据，禁止覆盖！"));
 							continue;
 
-						} else {
-							paymentInfo = null;
 						}
 
 						TProvidentFund tProvidentFund = providentFundMapper.selectOne(Wrappers.<TProvidentFund>query().lambda()
@@ -1544,7 +1535,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						CompletableFuture<List<ErrorMessage>> listCompletableFuture = CompletableFuture.supplyAsync(()
 								-> executeImportSocialListThree(user, atomicLine, list, areaMap, areaMap2,
 								paymentInfoPensionMap, paymentInfoMedicalMap, paymentInfoUnEmpMap, paymentInfoInjuryMap,
-								paymentInfoBigMap,CommonConstants.ONE_INT, type, errorMessageList),
+								paymentInfoBigMap,type, errorMessageList),
 								yfSocialImportThreadPoolExecutor);
 						completableFutureList.add(listCompletableFuture);
 					}
@@ -1557,7 +1548,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						CompletableFuture<List<ErrorMessage>> oneCompletableFuture = CompletableFuture.supplyAsync(()
 										-> executeImportSocialListThree(user, atomicLine, finalList, areaMap,
 										areaMap2, paymentInfoPensionMap, paymentInfoMedicalMap, paymentInfoUnEmpMap,
-										paymentInfoInjuryMap, paymentInfoBigMap,CommonConstants.ONE_INT, type,
+										paymentInfoInjuryMap, paymentInfoBigMap, type,
 										errorMessageList), yfSocialImportThreadPoolExecutor);
 						completableFutureList.add(oneCompletableFuture);
 						lastIdx = 1;
@@ -1566,12 +1557,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							tempList.add(list.get(i));
 							if (i % partSize == 0) {
 								lastIdx = i;
-								final int idx = i - partSize + 2;
 								List<TPaymentHeFeiVo> finalTempList1 = tempList;
 								CompletableFuture<List<ErrorMessage>> listCompletableFuture = CompletableFuture.supplyAsync(()
 												-> executeImportSocialListThree(user, atomicLine, finalTempList1
 												, areaMap, areaMap2, paymentInfoPensionMap, paymentInfoMedicalMap,
-												paymentInfoUnEmpMap, paymentInfoInjuryMap, paymentInfoBigMap,idx, type,
+												paymentInfoUnEmpMap, paymentInfoInjuryMap, paymentInfoBigMap, type,
 												errorMessageList), yfSocialImportThreadPoolExecutor);
 								completableFutureList.add(listCompletableFuture);
 								tempList = new ArrayList<>();
@@ -1594,11 +1584,10 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						}
 
 						List<TPaymentHeFeiVo> finalTempList = tempList;
-						int finalLastIdx = lastIdx + 1;
 						CompletableFuture<List<ErrorMessage>> listCompletableFuture = CompletableFuture.supplyAsync(()
 										-> executeImportSocialListThree(user, atomicLine, finalTempList, areaMap,
 											areaMap2, paymentInfoPensionMap, paymentInfoMedicalMap, paymentInfoUnEmpMap,
-											paymentInfoInjuryMap, paymentInfoBigMap,finalLastIdx, type, errorMessageList)
+											paymentInfoInjuryMap, paymentInfoBigMap, type, errorMessageList)
 											, yfSocialImportThreadPoolExecutor);
 						completableFutureList.add(listCompletableFuture);
 					}
@@ -1616,12 +1605,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 
 				} catch (Exception e) {
 					log.error("社保缴费库数据批量导入异常：" + e);
-				} finally {
-					paymentInfoPensionMap.clear();
-					paymentInfoBigMap.clear();
-					paymentInfoMedicalMap.clear();
-					paymentInfoUnEmpMap.clear();
-					paymentInfoInjuryMap.clear();
 				}
 			}
 		}
@@ -1636,8 +1619,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 											  ConcurrentHashMap<String, TPaymentInfo> paymentInfoUnEmpMap,
 											  ConcurrentHashMap<String, TPaymentInfo> paymentInfoInjuryMap,
 											  ConcurrentHashMap<String, TPaymentInfo> paymentInfoBigMap,
-											  int idx, String type,List<ErrorMessage> errorMessageList) {
-		int i = idx;
+											  String type,List<ErrorMessage> errorMessageList) {
 		if (Common.isNotNull(list)) {
 			TPaymentInfo payExists = null;
 			TSocialFundInfo socialInfo = null;
@@ -1663,7 +1645,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 
 			for (TPaymentHeFeiVo infoVo : list) {
 				atomicLine.incrementAndGet();
-				++i;
 				if (Common.isNotNull(infoVo.getEmpIdcard())) {
 					infoVo.setEmpIdcard(infoVo.getEmpIdcard().replace("x", "X"));
 				}