From 50c9692f448343777dd0dcd4fee00fe2baf7dec0 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期日, 28 二月 2021 15:02:34 +0800
Subject: [PATCH] 首页查询修复bug

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml
index f29265d..b2a449d 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml
@@ -18,7 +18,7 @@
         IF (t.dimissionType = '4', 1, NULL)
         ) gsct
         FROM
-        t_emp_baseinfo t where 1=1 and t.delFlag=0
+        t_emp_baseinfo t where 1=1 and t.delFlag=0 and t.empStatus='1'
         <choose>
             <when test="btime!=null and btime!='' and etime!=null and etime!=''">
                 and date_format(t.createTime,'%Y-%m-%d') &gt;= #{btime}  and date_format(t.createTime,'%Y-%m-%d') &lt;= #{etime}
@@ -586,7 +586,7 @@
 
 
     <select id="zcbaseInfoList" resultType="cc.mrbird.febs.server.hr.entity.EmpBaseInfo">
-        select t1.* from t_emp_baseinfo t1 left join t_dept t2 on t1.deptId=t2.DEPT_ID where 1=1 and t1.delFlag=0
+        select t1.* from t_emp_baseinfo t1 left join t_dept t2 on t1.deptId=t2.DEPT_ID where 1=1 and t1.delFlag=0 and t.empStatus='1'
         <choose>
             <when test="number==8">
                and t1.dimissionType = '1'

--
Gitblit v1.8.0