From 7e11a8421250cf58b024eb13ef18ef43b9423312 Mon Sep 17 00:00:00 2001
From: xingze <13153582609@163.com>
Date: Mon, 15 Apr 2024 15:13:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=87=AA=E4=B8=BB=E6=8E=88=E6=9D=83?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../invoiceall/service/impl/AutonomousSqServiceImpl.java         | 1 +
 1 file changed, 1 insertion(+)

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<InvoiceAllYhdj> 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();

From 9dceadbe980c80910e171d065c0e45afdaf2e84e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Tue, 16 Apr 2024 15:07:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=E6=B7=BB=E5=8A=A0=E4=BC=81=E4=B8=9Aid?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/system/CompanyserviceMapper.xml    | 3 +++
 jianshui-ui/src/views/system/companyservice/index.vue        | 5 +++++
 2 files changed, 8 insertions(+)

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 @@
             <if test="sellername != null  and sellername != ''">and sellername like concat('%', #{sellername}, '%')</if>
             <if test="phone != null  and phone != ''">and phone = #{phone}</if>
             <if test="rebackType != null  and rebackType != ''">and reback_type = #{rebackType}</if>
+            <if test="companyid != null and companyid !=''">
+                and companyid = #{companyid}
+            </if>
         </where>
     </select>
 
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 @@
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
       <el-row>
         <el-col>
+          <el-form-item label="企业id" prop="companyid">
+            <el-input v-model="queryParams.companyid" placeholder="请输入企业id" clearable size="small"
+                      @keyup.enter.native="handleQuery"/>
+          </el-form-item>
           <el-form-item label="企业税号" prop="sellertax">
             <el-input v-model="queryParams.sellertax" placeholder="请输入企业税号" clearable size="small"
                       @keyup.enter.native="handleQuery"/>
@@ -205,6 +209,7 @@ export default {
         checker: null,
         payer: null,
         rebackType: null,
+        companyid: null,
       },
       // 表单参数
       form: {},