From eb0e421014556e9ee9f421c173312f3dcc9b350d Mon Sep 17 00:00:00 2001 From: mash Date: Sun, 25 Jun 2023 09:57:18 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BA=BA=E4=BA=8B=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E7=9B=B8=E5=85=B32?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ydool/staff/service/impl/ExchangeServiceImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ydool/staff/service/impl/ExchangeServiceImpl.java b/src/main/java/com/ydool/staff/service/impl/ExchangeServiceImpl.java index 3803fd5..a48b22b 100644 --- a/src/main/java/com/ydool/staff/service/impl/ExchangeServiceImpl.java +++ b/src/main/java/com/ydool/staff/service/impl/ExchangeServiceImpl.java @@ -131,6 +131,13 @@ public class ExchangeServiceImpl extends BaseService i @Override @Transactional(rollbackFor = Exception.class) public AjaxResult saveExchange(ExchangeRequest exchangeRequest) { + Personnel personnel = personnelMapper.selectById(exchangeRequest.getPersonnelId()); + if (personnel.getChangeAuditState()==2){ + return AjaxResult.fail("该人员有带领导审批数据，不能进行选调！"); + } + if ("1".equals(personnel.getChangeAlterationSign())){ + return AjaxResult.fail("该人员有变更中数据，不能进行选调！"); + } List attachmentList = exchangeRequest.getAttachmentList(); ArrayList s = new ArrayList<>(); Exchange exchange = BeanUtil.copyProperties(exchangeRequest, Exchange.class); @@ -219,7 +226,7 @@ public class ExchangeServiceImpl extends BaseService i .eq(Audit::getPersonnelId, id) .eq(Audit::getPerType,ArgsConst.EXCHANGE) .eq(Audit::getApprover, StpUtil.getLoginIdAsString()) - .eq(Audit::getAuditOrder, ArgsConst.WAITING); + .eq(Audit::getAuditState, ArgsConst.WAITING); Audit audit = auditMapper.selectOne(wrapper); if (ObjectUtil.isNotEmpty(audit)){ exchangeOneDto.setAuditBtn(true);