diff --git a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/AutonomousSqServiceImpl.java b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/AutonomousSqServiceImpl.java index e37fd69..9dd03df 100644 --- a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/AutonomousSqServiceImpl.java +++ b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/AutonomousSqServiceImpl.java @@ -369,6 +369,7 @@ public class AutonomousSqServiceImpl implements AutonomousSqService { QueryWrapper yhdjQueryWrapper = new QueryWrapper<>(); yhdjQueryWrapper.eq("nsrsbh", yhdj.getNsrsbh()); yhdjQueryWrapper.eq("identity", companyservice.getIdentity()); + yhdjQueryWrapper.eq("dlzh", yhdj.getDlzh()); InvoiceAllYhdj yhdjTemp = yhdjMapper.selectOne(yhdjQueryWrapper); // 日志信息 InvoiceAllApiLog invoiceAllApiLog = new InvoiceAllApiLog(); diff --git a/jianshui-system/src/main/resources/mapper/system/CompanyserviceMapper.xml b/jianshui-system/src/main/resources/mapper/system/CompanyserviceMapper.xml index c2fabfe..a2dc1d5 100644 --- a/jianshui-system/src/main/resources/mapper/system/CompanyserviceMapper.xml +++ b/jianshui-system/src/main/resources/mapper/system/CompanyserviceMapper.xml @@ -67,6 +67,9 @@ and sellername like concat('%', #{sellername}, '%') and phone = #{phone} and reback_type = #{rebackType} + + and companyid = #{companyid} + diff --git a/jianshui-ui/src/views/system/companyservice/index.vue b/jianshui-ui/src/views/system/companyservice/index.vue index b917b7d..2fe9e1e 100644 --- a/jianshui-ui/src/views/system/companyservice/index.vue +++ b/jianshui-ui/src/views/system/companyservice/index.vue @@ -3,6 +3,10 @@ + + + @@ -205,6 +209,7 @@ export default { checker: null, payer: null, rebackType: null, + companyid: null, }, // 表单参数 form: {},