From b6429eb41c2d158ab13b11daed3bbe3dd2ac45ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 9 Feb 2023 17:05:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=BF=87id=E6=9F=A5=E8=AF=A2=E5=B7=A5?=
 =?UTF-8?q?=E8=B5=84=E5=8D=95=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salaryBill/param/SalarySendDetailListQueryParam.java       | 2 ++
 .../entity/salaryBill/param/SalarySendDetailQueryParam.java    | 2 ++
 .../entity/salaryBill/param/SalarySendInfoQueryParam.java      | 1 +
 .../engine/salary/mapper/salarybill/SalarySendInfoMapper.xml   | 3 +++
 src/com/engine/salary/web/SalaryBillController.java            | 1 +
 5 files changed, 9 insertions(+)

diff --git a/src/com/engine/salary/entity/salaryBill/param/SalarySendDetailListQueryParam.java b/src/com/engine/salary/entity/salaryBill/param/SalarySendDetailListQueryParam.java
index 1e100d5f4..a5ebe455e 100644
--- a/src/com/engine/salary/entity/salaryBill/param/SalarySendDetailListQueryParam.java
+++ b/src/com/engine/salary/entity/salaryBill/param/SalarySendDetailListQueryParam.java
@@ -38,6 +38,8 @@ public class SalarySendDetailListQueryParam extends BaseQueryParam {
 
 //    @ApiModelProperty("姓名")
     private String username;
+    private Long userId;
+
 
 //    @ApiModelProperty("个税扣缴义务人的主键id")
     private Long taxAgent;
diff --git a/src/com/engine/salary/entity/salaryBill/param/SalarySendDetailQueryParam.java b/src/com/engine/salary/entity/salaryBill/param/SalarySendDetailQueryParam.java
index 2ab6cd3ce..e839e10c1 100644
--- a/src/com/engine/salary/entity/salaryBill/param/SalarySendDetailQueryParam.java
+++ b/src/com/engine/salary/entity/salaryBill/param/SalarySendDetailQueryParam.java
@@ -39,6 +39,8 @@ public class SalarySendDetailQueryParam extends BaseQueryParam {
 //    @ApiModelProperty("姓名")
     private String username;
 
+    private Long userId;
+
 //    @ApiModelProperty("个税扣缴义务人的主键id")
     private Long taxAgentId;
 
diff --git a/src/com/engine/salary/entity/salaryBill/param/SalarySendInfoQueryParam.java b/src/com/engine/salary/entity/salaryBill/param/SalarySendInfoQueryParam.java
index 2bac2f3c5..b48abeb72 100644
--- a/src/com/engine/salary/entity/salaryBill/param/SalarySendInfoQueryParam.java
+++ b/src/com/engine/salary/entity/salaryBill/param/SalarySendInfoQueryParam.java
@@ -39,6 +39,7 @@ public class SalarySendInfoQueryParam extends BaseQueryParam {
 
 //    @ApiModelProperty("姓名")
     private String username;
+    private Long userId;
 
 //    @ApiModelProperty("个税扣缴义务人的主键id")
     private Long taxAgentId;
diff --git a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
index 3d7f453ac..dfed0f2ad 100644
--- a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
+++ b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
@@ -170,6 +170,9 @@
         <if test="param.username != null and param.username != ''">
             AND e.lastname like CONCAT('%',#{param.username},'%')
         </if>
+        <if test="param.userId != null">
+            AND e.id  = #{param.userId}
+        </if>
         <!-- 个税扣缴义务人id -->
         <if test="param.taxAgentId != null">
             AND t2.id = #{param.taxAgentId}
diff --git a/src/com/engine/salary/web/SalaryBillController.java b/src/com/engine/salary/web/SalaryBillController.java
index 6f2c743f3..52bf9629c 100644
--- a/src/com/engine/salary/web/SalaryBillController.java
+++ b/src/com/engine/salary/web/SalaryBillController.java
@@ -408,6 +408,7 @@ public class SalaryBillController {
         User user = HrmUserVarify.getUser(request, response);
         // 处理入参复用方法
         SalarySendDetailQueryParam detailQueryParam = SalarySendDetailQueryParam.builder()
+                .userId(queryParam.getUserId())
                 .departmentIds(SalaryEntityUtil.isNullOrEmpty(queryParam.getDepartment()) ? null : Collections.singletonList(queryParam.getDepartment()))
                 .salarySendId(queryParam.getSalarySendId())
                 .mergeCountTax(queryParam.getMergeCountTax())