From 04154b7f06a3ba0367115835ad62512d05862f57 Mon Sep 17 00:00:00 2001 From: zhangxuanming <2260476558@qq.com> Date: Thu, 6 Feb 2025 11:37:42 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=BD=A6=E9=97=B4=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=E5=A2=9E=E5=8A=A0=E8=B4=9F=E8=B4=A3=E4=BA=BAid?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E3=80=82=E7=B3=BB=E7=BB=9F=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E5=81=9A=E5=94=AF=E4=B8=80=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/system/SysDeptController.java | 8 ++++++-- .../java/com/ktg/mes/md/domain/MdWorkshop.java | 14 +++++++++++++- .../main/resources/mapper/md/MdWorkshopMapper.xml | 2 +- .../java/com/ktg/system/mapper/SysDeptMapper.java | 7 +++++++ .../com/ktg/system/service/ISysDeptService.java | 7 +++++++ .../system/service/impl/SysDeptServiceImpl.java | 11 +++++++++++ .../main/resources/mapper/system/SysDeptMapper.xml | 5 +++++ 7 files changed, 50 insertions(+), 4 deletions(-) diff --git a/ktg-admin/src/main/java/com/ktg/web/controller/system/SysDeptController.java b/ktg-admin/src/main/java/com/ktg/web/controller/system/SysDeptController.java index 233f339..af451fd 100644 --- a/ktg-admin/src/main/java/com/ktg/web/controller/system/SysDeptController.java +++ b/ktg-admin/src/main/java/com/ktg/web/controller/system/SysDeptController.java @@ -116,8 +116,9 @@ public class SysDeptController extends BaseController { return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败,部门名称已存在"); } - String s = autoCodeUtil.genSerialCode("DEPT_CODE", null); - dept.setDeptCode(s); + if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptCodeUnique(dept))) { + return AjaxResult.error("新增部门'" + dept.getDeptCode() + "'失败,部门编码已存在"); + } dept.setCreateBy(getUsername()); return toAjax(deptService.insertDept(dept)); } @@ -132,6 +133,9 @@ public class SysDeptController extends BaseController { Long deptId = dept.getDeptId(); deptService.checkDeptDataScope(deptId); + if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptCodeUnique(dept))) { + return AjaxResult.error("新增部门'" + dept.getDeptCode() + "'失败,部门编码已存在"); + } if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) { return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败,部门名称已存在"); diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/domain/MdWorkshop.java b/ktg-mes/src/main/java/com/ktg/mes/md/domain/MdWorkshop.java index 9eaac38..5bd45ca 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/md/domain/MdWorkshop.java +++ b/ktg-mes/src/main/java/com/ktg/mes/md/domain/MdWorkshop.java @@ -35,6 +35,9 @@ public class MdWorkshop extends BaseEntity @Excel(name = "负责人") private String charge; + /** 负责人id */ + private Long chargeId; + /** 是否启用 */ @Excel(name = "是否启用") private String enableFlag; @@ -51,7 +54,15 @@ public class MdWorkshop extends BaseEntity /** 预留字段4 */ private Long attr4; - public void setWorkshopId(Long workshopId) + public Long getChargeId() { + return chargeId; + } + + public void setChargeId(Long chargeId) { + this.chargeId = chargeId; + } + + public void setWorkshopId(Long workshopId) { this.workshopId = workshopId; } @@ -150,6 +161,7 @@ public class MdWorkshop extends BaseEntity .append("workshopName", getWorkshopName()) .append("area", getArea()) .append("charge", getCharge()) + .append("chargeId", getChargeId()) .append("enableFlag", getEnableFlag()) .append("remark", getRemark()) .append("attr1", getAttr1()) diff --git a/ktg-mes/src/main/resources/mapper/md/MdWorkshopMapper.xml b/ktg-mes/src/main/resources/mapper/md/MdWorkshopMapper.xml index ea2dfaf..cf4808f 100644 --- a/ktg-mes/src/main/resources/mapper/md/MdWorkshopMapper.xml +++ b/ktg-mes/src/main/resources/mapper/md/MdWorkshopMapper.xml @@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select workshop_id, workshop_code, workshop_name, area, charge, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from md_workshop + select workshop_id, workshop_code, workshop_name, area, charge, charge_id, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from md_workshop + insert into sys_dept(