From 60652dfbde86bb4eabdc4c7c6add73bd47b56a4c Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Mon, 31 Oct 2022 16:00:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-=E7=A6=8F?=
 =?UTF-8?q?=E5=88=A9=E6=A1=A3=E6=A1=88=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E9=83=A8=E5=AD=97=E6=AE=B5=E5=8F=8A?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/biz/SIArchivesBiz.java   |  8 ++++++++
 .../param/InsuranceArchivesListParam.java      |  3 +++
 .../mapper/siarchives/SocialSchemeMapper.xml   | 18 ++++++++++++++++++
 3 files changed, 29 insertions(+)

diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java
index 84c939c7e..43edbaf0e 100644
--- a/src/com/engine/salary/biz/SIArchivesBiz.java
+++ b/src/com/engine/salary/biz/SIArchivesBiz.java
@@ -1219,6 +1219,14 @@ public class SIArchivesBiz {
         positions.setLabel("岗位");
         conditionItems.add(positions);
 
+        SearchConditionItem subcompanyIds = conditionFactory.createCondition(ConditionType.BROWSER, 502327, "subcompanyIdsStr", "194");
+        subcompanyIds.setInputType("browser");
+        subcompanyIds.setColSpan(2);
+        subcompanyIds.setFieldcol(16);
+        subcompanyIds.setLabelcol(8);
+        subcompanyIds.setIsQuickSearch(true);
+        subcompanyIds.setLabel("分部");
+        conditionItems.add(subcompanyIds);
 
 //        SearchConditionItem hireDate = conditionFactory.createCondition(ConditionType.TIMEPICKER,502327,new String[]{"hireDate", "hireDate"});
 //        hireDate.setInputType("timepicker");
diff --git a/src/com/engine/salary/entity/siarchives/param/InsuranceArchivesListParam.java b/src/com/engine/salary/entity/siarchives/param/InsuranceArchivesListParam.java
index 3ff5d8fae..5bac5a942 100644
--- a/src/com/engine/salary/entity/siarchives/param/InsuranceArchivesListParam.java
+++ b/src/com/engine/salary/entity/siarchives/param/InsuranceArchivesListParam.java
@@ -30,6 +30,9 @@ public class InsuranceArchivesListParam extends BaseQueryParam {
     //部门(多选)")
     private List<BigDecimal> departmentIds;
 
+    //分部(多选)")
+    private List<BigDecimal> subcompanyIds;
+
     private String departmentIdsStr;
 
     //状态(多线)")
diff --git a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml
index 4fa4685a7..f5c3abb92 100644
--- a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml
+++ b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml
@@ -373,6 +373,12 @@
                 #{departmentId}
             </foreach>
         </if>
+        <if test="param.subcompanyIds != null and param.subcompanyIds.size()>0">
+            AND e.subcompanyid1 IN
+            <foreach collection="param.subcompanyIds" open="(" item="subcompanyId" separator="," close=")">
+                #{subcompanyId}
+            </foreach>
+        </if>
         <if test="param.statuses != null and param.statuses.size()>0">
             AND e.STATUS IN
             <foreach collection="param.statuses" open="(" item="userStatus" separator="," close=")">
@@ -440,6 +446,12 @@
                 #{departmentId}
             </foreach>
         </if>
+        <if test="param.subcompanyIds != null and param.subcompanyIds.size()>0">
+            AND e.subcompanyid1 IN
+            <foreach collection="param.subcompanyIds" open="(" item="subcompanyId" separator="," close=")">
+                #{subcompanyId}
+            </foreach>
+        </if>
         <if test="param.statuses != null and param.statuses.size()>0">
             AND e.STATUS IN
             <foreach collection="param.statuses" open="(" item="userStatus" separator="," close=")">
@@ -507,6 +519,12 @@
                 #{departmentId}
             </foreach>
         </if>
+        <if test="param.subcompanyIds != null and param.subcompanyIds.size()>0">
+            AND e.subcompanyid1 IN
+            <foreach collection="param.subcompanyIds" open="(" item="subcompanyId" separator="," close=")">
+                #{subcompanyId}
+            </foreach>
+        </if>
         <if test="param.statuses != null and param.statuses.size()>0">
             AND e.STATUS IN
             <foreach collection="param.statuses" open="(" item="userStatus" separator="," close=")">