From c979b4824ab9a28392696dc829cd01f65b54e83b Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期日, 21 二月 2021 17:08:06 +0800
Subject: [PATCH] 增加导入员工其它信息

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccessoryMapper.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/EmpAccessoryMapper.xml b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccessoryMapper.xml
index d49f51e..af49ff7 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccessoryMapper.xml
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccessoryMapper.xml
@@ -7,10 +7,10 @@
        (select dept_Name from t_dept as dept where dept.dept_Id= a.deptId) as deptName,a.jobName,',(SELECT
   GROUP_CONCAT(DISTINCT
     CONCAT(
-      '(SELECT  COUNT(1) FROM  t_emp_accessory accessory inner join t_label label where label.labelId=accessory.labelId and accessory.delFlag = 0 and label.delFlag = 0) AS ''',
+      '(SELECT  COUNT(1) FROM  t_emp_accessory accessory inner join t_label label where label.labelId=accessory.labelId and accessory.delFlag = 0 and label.delFlag = 0 and a.empId = accessory.empId  and label.labelCode = ''',label.labelCode,''') AS ''',
       label.labelCode, ''''
     )
   )
-FROM t_label label order by label.sort),' from t_emp_baseinfo a') as querySql
+FROM t_label label where label.delFlag = 0 order by label.sort),' from t_emp_baseinfo a') as querySql
     </select>
 </mapper>

--
Gitblit v1.8.0