From a588d718f900817e2d477e24998a13f43fcf8282 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 6 Mar 2023 19:02:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B1=89=E6=A1=91=E9=83=A8=E9=97=A8=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E4=BA=8C=E5=BC=80=EF=BC=8C=E6=B7=BB=E5=8A=A0=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E5=90=AF=E7=94=A8=E6=97=B6=E9=97=B4=E3=80=81=E5=B0=81?= =?UTF-8?q?=E5=AD=98=E6=97=B6=E9=97=B4=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/service/impl/DepartmentServiceImpl.java | 8 ++++---- .../organization/util/saveimport/DepartmentImport.java | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index 28e64257..5aaeed0c 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -175,16 +175,16 @@ public class DepartmentServiceImpl extends Service implements DepartmentService public Long saveBaseForm(Map params) { HasRightUtil.hasRight(user, RIGHT_NAME, false); /* - * 汉桑部门需求二开，添加部门启用时间、封存时间校验 - * 启用时间、封存时间必须大于等于当前日期; + * 汉桑部门需求二开，添加部门启用日期、封存日期校验 + * 启用日期、封存日期必须大于等于当前日期; * 启用日期小于封存日期; */ String enableDate = Util.null2String(params.get("qyrq")); String disableDate = Util.null2String(params.get("fcrq")); String currentDate = DateUtil.getCurrentDate(); - OrganizationAssert.notBlank(enableDate, "启用时间必填"); - OrganizationAssert.isTrue(DateUtil.compDate(currentDate, enableDate) >= 0, "启用时间大于等于当前日期"); + OrganizationAssert.notBlank(enableDate, "启用日期必填"); + OrganizationAssert.isTrue(DateUtil.compDate(currentDate, enableDate) >= 0, "启用日期大于等于当前日期"); if (StringUtils.isNotBlank(disableDate)) { OrganizationAssert.isTrue(DateUtil.compDate(enableDate, disableDate) > 0, "启用日期小于封存日期"); diff --git a/src/com/engine/organization/util/saveimport/DepartmentImport.java b/src/com/engine/organization/util/saveimport/DepartmentImport.java index 7977bc05..203f0a55 100644 --- a/src/com/engine/organization/util/saveimport/DepartmentImport.java +++ b/src/com/engine/organization/util/saveimport/DepartmentImport.java @@ -298,14 +298,14 @@ public class DepartmentImport { } /* - * 汉桑部门需求二开，添加部门启用时间、封存时间校验 - * 启用时间、封存时间必须大于等于当前日期; + * 汉桑部门需求二开，添加部门启用日期、封存日期校验 + * 启用日期、封存日期必须大于等于当前日期; * 启用日期小于封存日期; */ if (StringUtils.isNotBlank(enableDate)) { String currentDate = DateUtil.getCurrentDate(); if (DateUtil.compDate(currentDate, enableDate) < 0) { - historyDetailPO.setOperateDetail("启用时间大于等于当前日期"); + historyDetailPO.setOperateDetail("启用日期大于等于当前日期"); historyDetailPO.setStatus("0"); OrgImportUtil.saveImportDetailLog(historyDetailPO); continue;