From 267437f05a34f449eb4604c39597cad9744e5c43 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Mon, 15 Jul 2024 16:05:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8A=B1=E5=90=8D=E5=86=8C=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=88=97=E5=AE=9A=E5=88=B6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/FunctionOutStaffServiceImpl.java | 2 +- .../service/impl/HrmResourceServiceImpl.java | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java b/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java index a1e12ad2..8e7bbd60 100644 --- a/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java +++ b/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java @@ -76,7 +76,7 @@ public class FunctionOutStaffServiceImpl { private Integer frozenStaffNums(StaffOutParam param) { StaffPO staffPO = select(param); List numberF = Arrays.asList(staffPO.getFreezeNum(),param.getNum()); - //1.增加冻结数 + //1.增加冻结数 （num为负数时为减少冻结数） Integer sum = numberF.stream() .mapToInt(Integer::intValue) .sum(); diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index 4cf54531..fbe393a8 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -307,17 +307,22 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic public Map getSearchTemplate(Map params) { Map returnMap = new HashMap<>(); String type = Util.null2String(params.get("type")); + String id = Util.null2String(params.get("id")); + if ("".equals(id)) { + id = "-1"; + } int userUID = user.getUID(); // 根据ID查询所存储的模板 List templates; if ("custom".equals(type)) { templates = getHrmResourceMapper().getCustomTemplatesByUser(userUID); - SearchTemplatePO usedCustomTemplate = getHrmResourceMapper().getUsedCustomTemplateByUser(user.getUID()); - if (null != usedCustomTemplate) { - returnMap.put("templateId", usedCustomTemplate.getId().toString()); - } else { - returnMap.put("templateId", "-1"); - } + returnMap.put("id", id); +// SearchTemplatePO usedCustomTemplate = getHrmResourceMapper().getUsedCustomTemplateByUser(user.getUID()); +// if (null != usedCustomTemplate) { +// returnMap.put("templateId", usedCustomTemplate.getId().toString()); +// } else { +// returnMap.put("templateId", "-1"); +// } } else { templates = getHrmResourceMapper().getSearchTemplatesByUser(userUID); }