From e76d69439ac103f53cc81a4622024058a8f7979f Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 17 Aug 2022 11:18:46 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E5=B7=A5=E4=BD=9C=E7=BB=84=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E9=87=8C=E9=9D=A2=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6=EF=BC=8C=E6=8C=89=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/project/entity/PayWorkingGroupSearch.java | 3 +++
 .../com/jero/project/mapper/xml/PayWorkingGroupMapper.xml   | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSearch.java
index 8cc5addb..0aecd905 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSearch.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSearch.java
@@ -43,4 +43,7 @@ public class PayWorkingGroupSearch {
     @ApiModelProperty(value = "排序规则")
     private String order;
 
+    @ApiModelProperty(value = "排序规则")
+    private String departId;
+
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
index e2c6eb10..5ab33ea5 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
@@ -183,6 +183,9 @@
                     </if>
                 </otherwise>
             </choose>
+            <if test="payWorkingGroupSearch.departId != null and payWorkingGroupSearch.departId != ''">
+                and departId = #{payWorkingGroupSearch.departId}
+            </if>
         </where>
         group by superId
         ) p
@@ -265,6 +268,9 @@
                     </if>
                 </otherwise>
             </choose>
+            <if test="payWorkingGroupSearch.departId != null and payWorkingGroupSearch.departId != ''">
+                and departId = #{payWorkingGroupSearch.departId}
+            </if>
         </where>
         group by superId
         ) ppp