MVP1.4-缴费库删除

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

@@ -343,26 +343,33 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 		LambdaQueryWrapper<TPaymentInfo> wrapper = buildQueryWrapper(empIdCard, socialHouseId, fundHouseId,
 				socialCreateMonth, socialPayMonth);
 
-		List<TPaymentInfo> list = baseMapper.selectList(wrapper);
-		List<String> idList = new ArrayList<>();
+		List<TPaymentInfo> list;
 		boolean delFlag = false;
-		if (Common.isNotNull(list)) {
-			for (TPaymentInfo paymentInfo : list) {
-				if ((!user.getId().equals(paymentInfo.getCreateBy()) &&
-						!CommonConstants.ONE_STRING.equals(user.getId())) ||
-						CommonConstants.ZERO_STRING.equals(paymentInfo.getPushStatus()) ||
-						CommonConstants.ONE_STRING.equals(paymentInfo.getSalaryFundFlag()) ||
-						CommonConstants.ONE_STRING.equals(paymentInfo.getSalarySocialFlag())) {
-					delFlag = true;
-				} else {
-					idList.add(paymentInfo.getId());
-				}
-			}
+		if (CommonConstants.ONE_STRING.equals(user.getId())) {
+			list = baseMapper.selectList(wrapper.eq(TPaymentInfo::getPushStatus, CommonConstants.ONE_STRING)
+					.eq(TPaymentInfo::getSalarySocialFlag, CommonConstants.ZERO_STRING)
+					.eq(TPaymentInfo::getSalaryFundFlag, CommonConstants.ZERO_STRING)
+			);
 		} else {
-			return R.failed(CommonConstants.NO_DATA_TO_HANDLE);
+			list = baseMapper.selectList(wrapper.eq(TPaymentInfo::getPushStatus, CommonConstants.ONE_STRING)
+					.eq(TPaymentInfo::getSalarySocialFlag, CommonConstants.ZERO_STRING)
+					.eq(TPaymentInfo::getSalaryFundFlag, CommonConstants.ZERO_STRING)
+					.eq(TPaymentInfo::getCreateBy, user.getId())
+			);
+			long count = baseMapper.selectCount(wrapper.and(obj->obj.eq(TPaymentInfo::getPushStatus,CommonConstants.ZERO_STRING)
+					.or().eq(TPaymentInfo::getSalarySocialFlag, CommonConstants.ONE_STRING)
+					.or().eq(TPaymentInfo::getSalaryFundFlag, CommonConstants.ONE_STRING)
+					.or().ne(TPaymentInfo::getCreateBy, user.getId())
+					)
+			);
+			if (count > 0) {
+				delFlag = true;
+			}
 		}
-		if (Common.isNotNull(idList)) {
-			baseMapper.deleteBatchIds(idList);
+		if (Common.isNotNull(list)) {
+			baseMapper.deleteBatchIds(list);
+		} else if (!delFlag) {
+			return R.failed(CommonConstants.NO_DATA_TO_HANDLE);
 		}
 		if (delFlag) {
 			return R.ok(null, "存在不符合条件的数据(已推送至结算平台或非本人创建),禁止删除！");