From db38f47d516bb0503a76eacbf4c98ac5af744158 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Thu, 20 May 2021 13:58:51 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.0.4=E3=80=91hr=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/service/impl/HrPositionServiceImpl.java     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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 10dabbcc4..88a517570 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
@@ -155,18 +155,17 @@ public class HrPositionServiceImpl extends ServiceImpl<HrPositionMapper, HrPosit
         Long positionId = hrPositionRequest.getPositionId();
         String positionName = hrPositionRequest.getPositionName();
         String positionCode = hrPositionRequest.getPositionCode();
+        Integer statusFlag = hrPositionRequest.getStatusFlag();
 
         // SQL条件拼接
         queryWrapper.eq(ObjectUtil.isNotNull(positionId), HrPosition::getPositionId, positionId);
         queryWrapper.like(StrUtil.isNotEmpty(positionName), HrPosition::getPositionName, positionName);
         queryWrapper.eq(StrUtil.isNotEmpty(positionCode), HrPosition::getPositionCode, positionCode);
+        queryWrapper.eq(ObjectUtil.isNotNull(statusFlag), HrPosition::getStatusFlag, statusFlag);
 
         // 查询未删除状态的
         queryWrapper.eq(HrPosition::getDelFlag, YesOrNotEnum.N.getCode());
 
-        // 查询未禁用的
-        queryWrapper.eq(HrPosition::getStatusFlag, StatusEnum.ENABLE.getCode());
-
         // 根据排序升序排列
         queryWrapper.orderByAsc(HrPosition::getPositionSort);