From 15ae02339d3802c2855073ff0a34b1408cc74b45 Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Thu, 16 May 2024 11:10:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=EF=BC=8C=E5=87=BA=E5=8B=A4?=
 =?UTF-8?q?=E6=B4=A5=E8=B4=B4=E6=95=B0=E6=8D=AE=E7=94=9F=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=B8=AD=E7=9B=AE=E6=A0=87=E4=BA=BA=E5=91=98=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E9=80=BB=E8=BE=91=E5=8F=98=E6=9B=B4=EF=BC=8C=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=E9=80=9A=E7=94=A8=E6=B4=A5=E8=B4=B4=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E9=80=82=E7=94=A8=E8=8C=83=E5=9B=B4=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E4=B8=BA=E5=85=A8=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workflow/service/impl/AllowanceServiceImpl.java  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/com/engine/attendance/workflow/service/impl/AllowanceServiceImpl.java b/src/com/engine/attendance/workflow/service/impl/AllowanceServiceImpl.java
index 8f4a680..b93d55a 100644
--- a/src/com/engine/attendance/workflow/service/impl/AllowanceServiceImpl.java
+++ b/src/com/engine/attendance/workflow/service/impl/AllowanceServiceImpl.java
@@ -90,6 +90,18 @@ public class AllowanceServiceImpl extends Service implements AllowanceService {
                     });
                 }
             }
+            //20240515产品需求变更，即使考勤方案未设置适用范围，对于通用津贴类型考勤项目，也要适用于全员
+            if (tyAllowanceIds.size() > 0) {
+                String empSql = "select id from hrmresource where 1=1 ";
+                if (targetEmpIdList.size() > 0) {
+                    empSql = empSql + " and id not in (" + String.join(",",targetEmpIdList) + ")";
+                }
+                List<Map<String, Object>> empData = DbTools.getSqlToList(empSql);
+                for (Map<String, Object> empInfo : empData) {
+                    targetEmpIdList.add(empInfo.get("id").toString());
+                    empIdWithAllowanceInfo.put(empInfo.get("id").toString(), tyAllowanceIds);
+                }
+            }
             //构建班次和津贴映射关系
             Map<String, Map<String, Object>> allowanceIdWithKqxmInfo = new HashMap<>();
             Map<String, List<String>> bcWithAllowanceInfo = new HashMap<>();