From cf637bd648a40c4cc00d738785c947f27728f843 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期一, 22 二月 2021 01:36:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml |   12 ++++++------
 1 files changed, 6 insertions(+), 6 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 ab3e37a..f29265d 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
@@ -77,7 +77,7 @@
         count(IF(t1.contractStatus = 3, 1, NULL)) jcht
 
         FROM
-        t_emp_baseinfo t left JOIN t_emp_contractinfo t1 on t.empId=t1.empId where 1=1 and t.delFlag=0
+        t_emp_baseinfo t left JOIN t_emp_contractinfo t1 on t.empId=t1.empId where 1=1 and t.delFlag=0 and t1.delFlag=0
         <choose>
             <when test="btime!=null and btime!='' and etime!=null and etime!=''">
                 and date_format(t.dimissionDate,'%Y-%m-%d') &gt;= #{btime}  and date_format(t.dimissionDate,'%Y-%m-%d') &lt;= #{etime}
@@ -100,7 +100,7 @@
         SELECT
         count(1) czyg
         FROM
-        t_emp_baseinfo t INNER JOIN t_emp_resign t1 on t.empId=t1.empId where 1=1 and t.delFlag=0
+        t_emp_baseinfo t INNER JOIN t_emp_resign t1 on t.empId=t1.empId where 1=1 and t.delFlag=0 and t1.delFlag=0
         <choose>
             <when test="btime!=null and btime!='' and etime!=null and etime!=''">
                 and date_format(t1.applayDate,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.applayDate,'%Y-%m-%d') &lt;= #{etime}
@@ -126,7 +126,7 @@
         count(IF(t1.contractStatus = 2, 1, NULL)) xqht
 
         FROM
-        t_emp_baseinfo t INNER JOIN t_emp_contractinfo t1 on t.empId=t1.empId where 1=1 and t.delFlag=0
+        t_emp_baseinfo t INNER JOIN t_emp_contractinfo t1 on t.empId=t1.empId where 1=1 and t.delFlag=0 and t1.delFlag=0
         <choose>
             <when test="btime!=null and btime!='' and etime!=null and etime!=''">
                 and date_format(t1.signingDate,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.signingDate,'%Y-%m-%d') &lt;= #{etime}
@@ -150,7 +150,7 @@
         SELECT
         count(IF(t1.contractStatus = 1 or t1.contractStatus = 2, 1, NULL)) yxht
         FROM
-        t_emp_baseinfo t INNER JOIN t_emp_contractinfo t1 on t.empId=t1.empId where 1=1 and t.delFlag=0
+        t_emp_baseinfo t INNER JOIN t_emp_contractinfo t1 on t.empId=t1.empId where 1=1 and t.delFlag=0 and t1.delFlag=0
     </select>
 
 
@@ -158,7 +158,7 @@
         SELECT
         count(IF(t1.contractStatus = 4, 1, NULL)) dqht
         FROM
-        t_emp_baseinfo t INNER JOIN t_emp_contractinfo t1 on t.empId=t1.empId where 1=1 and t.delFlag=0
+        t_emp_baseinfo t INNER JOIN t_emp_contractinfo t1 on t.empId=t1.empId where 1=1 and t.delFlag=0 and t1.delFlag=0
         <choose>
             <when test="btime!=null and btime!='' and etime!=null and etime!=''">
                 and date_format(t1.endDate,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.endDate,'%Y-%m-%d') &lt;= #{etime}
@@ -204,7 +204,7 @@
         SELECT
         count(1) ygqj
         FROM
-        t_emp_baseinfo t right  JOIN t_emp_leaveinfo t1 on t.empId=t1.empId where 1=1
+        t_emp_baseinfo t right  JOIN t_emp_leaveinfo t1 on t.empId=t1.empId where 1=1 and t.delFlag=0 and t1.delFlag=0
         <choose>
             <when test="btime!=null and btime!='' and etime!=null and etime!=''">
                 and date_format(t1.returnDate,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.returnDate,'%Y-%m-%d') &lt;= #{etime}

--
Gitblit v1.8.0