From 97a5f5e997fea298c6e520302ccc686d8199231b Mon Sep 17 00:00:00 2001 From: buaixuexideshitongxue <2936013465@qq.com> Date: Fri, 12 Dec 2025 18:20:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=81=A2=E5=A4=8D=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biutag/supervision/controller/system/PoliceController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/biutag/supervision/controller/system/PoliceController.java b/src/main/java/com/biutag/supervision/controller/system/PoliceController.java index 391dd6a..ccb265e 100644 --- a/src/main/java/com/biutag/supervision/controller/system/PoliceController.java +++ b/src/main/java/com/biutag/supervision/controller/system/PoliceController.java @@ -92,7 +92,8 @@ public class PoliceController { throw new RuntimeException(String.format("该人员[%s]已存在于“%s”单位中,请联系二级机构或市局管理员以进行人员调整。", policeDto.getIdCode(), depart.getName())); } SupPolice delPolice= supPoliceMapper.selectByIdCodeAndDel(policeDto.getIdCode(), AppConstants.DEL); - if (Objects.nonNull(delPolice)){ + if (Objects.nonNull(delPolice) && StrUtil.isNotBlank(delPolice.getDelReason()) + && !"退休".equals(delPolice.getDelReason()) && !"离职".equals(delPolice.getDelReason())){ delPolice.setOrgId(policeDto.getOrgId()); delPolice.setDel(AppConstants.UN_DEL); delPolice.setDelReason("");