push

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/SalaryServiceImpl.java

@@ -3,6 +3,7 @@ package com.yd.csf.service.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yd.csf.feign.enums.SalaryStatusEnum;
 import com.yd.csf.feign.request.salary.ApiSalaryPageRequest;
 import com.yd.csf.feign.request.salary.ApiSalaryPageRequest;
 import com.yd.csf.feign.request.salary.ApiSalaryPushPageRequest;
 import com.yd.csf.feign.request.salary.ApiSalaryPushPageRequest;
 import com.yd.csf.feign.response.salary.ApiSalaryPageResponse;
 import com.yd.csf.feign.response.salary.ApiSalaryPageResponse;
@@ -42,6 +43,7 @@ public class SalaryServiceImpl extends ServiceImpl<SalaryMapper, Salary> impleme
         return this.baseMapper.selectOne(new LambdaQueryWrapper<Salary>()
         return this.baseMapper.selectOne(new LambdaQueryWrapper<Salary>()
                 .eq(Salary::getBrokerBizId,brokerBizId)
                 .eq(Salary::getBrokerBizId,brokerBizId)
                 .eq(Salary::getMonth,month)
                 .eq(Salary::getMonth,month)
+                .ne(Salary::getStatus, SalaryStatusEnum.YQX.getItemValue())
                 .ne(isExcludeMy,Salary::getSalaryBizId,salaryBizId)
                 .ne(isExcludeMy,Salary::getSalaryBizId,salaryBizId)
                 .last(" limit 1 ")
                 .last(" limit 1 ")
         );
         );