From 3ae6bd194fe1f17b4f5d96cb78b057705e5d0d78 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期一, 31 五月 2021 14:11:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpLaborTroubleMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpLaborTroubleMapper.xml b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpLaborTroubleMapper.xml
index af3a5da..60d810e 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpLaborTroubleMapper.xml
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpLaborTroubleMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cc.mrbird.febs.server.hr.mapper.EmpLaborTroubleMapper">
<select id="selectPageVo" resultType="cc.mrbird.febs.server.hr.entity.EmpLaborTrouble">
- select a.* from t_emp_labortrouble a
+ select a.*,b.allDeptName from t_emp_labortrouble a
inner join t_emp_baseinfo b on a.empId = b.empId
inner join t_dept c on b.deptId = c.DEPT_ID
${ew.customSqlSegment}
--
Gitblit v1.8.0