From 104da41f28d7345ae341e824ec50107501ade29f Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Tue, 27 May 2025 17:36:49 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=8A=B1=E5=90=8D=E5=86=8C=E5=88=97=E5=AE=9A?= =?UTF-8?q?=E5=88=B6=20=E7=B3=BB=E7=BB=9F=E5=AD=97=E6=AE=B5=E5=8F=97?= =?UTF-8?q?=E5=90=AF=E7=94=A8=E9=99=90=E5=88=B6=202.=E7=BC=96=E5=88=B6?= =?UTF-8?q?=E5=86=BB=E7=BB=93=E6=8E=A5=E5=8F=A3=E5=BC=BA=E6=8E=A7=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/organization/mapper/hrmresource/SystemDataMapper.xml | 2 +- .../organization/service/impl/FunctionOutStaffServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.xml b/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.xml index 09a8e63d..9db50520 100644 --- a/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.xml +++ b/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.xml @@ -149,7 +149,7 @@ groupid, #{scopeId} as scopeId, 'hrm' as tablename - FROM hrm_formfield) hrmallfield + FROM hrm_formfield where isuse = 1) hrmallfield WHERE FIELDHTMLTYPE != '6' and groupid IN (SELECT id FROM hrm_fieldgroup WHERE grouptype = #{scopeId}) ORDER BY hrmallfield.groupid, hrmallfield.fieldorder diff --git a/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java b/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java index 778c25bb..27f46cac 100644 --- a/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java +++ b/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java @@ -81,7 +81,7 @@ public class FunctionOutStaffServiceImpl { OrganizationAssert.isFalse(staffPO.getFreezeNum() == 0, SystemEnv.getHtmlLabelName(547949,user.getLanguage())); } - List numberF = Arrays.asList(staffPO.getFreezeNum(),param.getNum()); + List numberF = Arrays.asList(staffPO.getFreezeNum(),param.getNum(),staffPO.getPermanentNum()); //1.增加冻结数 （num为负数时为减少冻结数） Integer sum = numberF.stream() .mapToInt(Integer::intValue)