From 9796bdc8233673bde9f1204fb418aec594f1458c Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 21 Jun 2022 18:23:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=EF=BC=8C=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/entity/staff/vo/StaffPlanTableVO.java | 2 +- .../organization/service/impl/SchemeServiceImpl.java | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java b/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java index 01bae639..96d9e4c2 100644 --- a/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java +++ b/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java @@ -71,7 +71,7 @@ public class StaffPlanTableVO { /** * 状态 */ - @OrganizationTableColumn(text = "状态", width = "16%", column = "forbidden_tag") + @OrganizationTableColumn(text = "是否启用", width = "16%", column = "forbidden_tag") private Integer forbiddenTag; } diff --git a/src/com/engine/organization/service/impl/SchemeServiceImpl.java b/src/com/engine/organization/service/impl/SchemeServiceImpl.java index 3ee3c742..6ad771c1 100644 --- a/src/com/engine/organization/service/impl/SchemeServiceImpl.java +++ b/src/com/engine/organization/service/impl/SchemeServiceImpl.java @@ -72,6 +72,12 @@ public class SchemeServiceImpl extends Service implements SchemeService { HasRightUtil.hasRight(user, RIGHT_NAME, false); Map apidatas = new HashMap<>(); SchemePO schemePO = SchemeDTO.convertParamToPO(param, (long) user.getUID()); + // 更新前先查询下旧编号， + String oldSchemeNo = getSchemeMapper().getSchemeByID(schemePO.getId()).getSchemeNo(); + if (!oldSchemeNo.equals(schemePO.getSchemeNo())) { + List list = getSchemeMapper().listByNo(Util.null2String(schemePO.getSchemeNo())); + OrganizationAssert.isEmpty(list, "编号不允许重复"); + } getSchemeMapper().updateScheme(schemePO); return apidatas; } @@ -129,7 +135,7 @@ public class SchemeServiceImpl extends Service implements SchemeService { textareaItem.setValue(schemePO.getSchemeDescription()); // 编辑状态下,编号只读 - schemeNoCondition.setViewAttr(1); + // schemeNoCondition.setViewAttr(1); } selectItems.add(schemeNoCondition);