From 5b377be044752b9238c258e3a0456d1dcc47ae3e Mon Sep 17 00:00:00 2001
From: chenjinlong <22208488@qq.com>
Date: Mon, 21 Dec 2020 20:19:46 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90updateStatus=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4=E9=A6=96=E5=85=88?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE=E6=98=AF=E5=90=A6=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/service/impl/HrOrganizationServiceImpl.java | 5 ++---
 .../organization/service/impl/HrPositionServiceImpl.java     | 5 +++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java
index 422bba9be..0e4299059 100644
--- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java
+++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java
@@ -131,11 +131,10 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
 
     @Override
     public void updateStatus(HrOrganizationRequest hrOrganizationRequest) {
-
+        HrOrganization hrOrganization = this.queryOrganization(hrOrganizationRequest);
         LambdaUpdateWrapper<HrOrganization> updateWrapper = new LambdaUpdateWrapper<>();
-        updateWrapper.eq(HrOrganization::getOrgId, hrOrganizationRequest.getOrgId());
+        updateWrapper.eq(HrOrganization::getOrgId, hrOrganization.getOrgId());
         updateWrapper.set(HrOrganization::getStatusFlag, hrOrganizationRequest.getStatusFlag());
-
         this.update(updateWrapper);
     }
 
diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrPositionServiceImpl.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrPositionServiceImpl.java
index 07c17e28b..2dbd307ff 100644
--- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrPositionServiceImpl.java
+++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrPositionServiceImpl.java
@@ -82,8 +82,9 @@ public class HrPositionServiceImpl extends ServiceImpl<HrPositionMapper, HrPosit
 
     @Override
     public void updateStatus(HrPositionRequest hrPositionRequest) {
+        HrPosition sysPosition = this.querySysPosition(hrPositionRequest);
         LambdaUpdateWrapper<HrPosition> updateWrapper = new LambdaUpdateWrapper<>();
-        updateWrapper.eq(HrPosition::getPositionId, hrPositionRequest.getPositionId());
+        updateWrapper.eq(HrPosition::getPositionId, sysPosition.getPositionId());
         updateWrapper.set(HrPosition::getStatusFlag, hrPositionRequest.getStatusFlag());
 
         this.update(updateWrapper);
@@ -162,7 +163,7 @@ public class HrPositionServiceImpl extends ServiceImpl<HrPositionMapper, HrPosit
     private HrPosition querySysPosition(HrPositionRequest hrPositionRequest) {
         HrPosition sysposition = this.getById(hrPositionRequest.getPositionId());
         if (ObjectUtil.isEmpty(sysposition)) {
-            String userTip = StrUtil.format(PositionExceptionEnum.CANT_FIND_POSITION.getUserTip(), sysposition.getPositionId());
+            String userTip = StrUtil.format(PositionExceptionEnum.CANT_FIND_POSITION.getUserTip(), hrPositionRequest.getPositionId());
             throw new SystemModularException(PositionExceptionEnum.CANT_FIND_POSITION, userTip);
         }
         return sysposition;