diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/EmployeesOrgMapper.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/EmployeesOrgMapper.java index 6e69ec5..fb63f71 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/EmployeesOrgMapper.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/EmployeesOrgMapper.java @@ -13,5 +13,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @Version: V1.0 */ public interface EmployeesOrgMapper extends BaseMapper { - List getEmployeesOrgListByEmpId(@Param("employeesId") String employeesId); + List getEmployeesOrgListByEmpId(@Param("tel") String tel); } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/EmployeesOrgMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/EmployeesOrgMapper.xml index 7697f7d..9411d61 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/EmployeesOrgMapper.xml +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/EmployeesOrgMapper.xml @@ -7,13 +7,20 @@ a.org_code as orgCode, concat(CASE WHEN RIGHT(b.url, 1) = '/' THEN LEFT(b.url, LENGTH(b.url)) ELSE b.url END, b.context_path ) AS serverUrl, b.depart_name - FROM nu_biz_employees_org a - LEFT JOIN sys_depart b - ON a.org_code = b.org_code - WHERE a.employees_id = #{employeesId} + FROM nu_biz_employees_advisory_info e + INNER JOIN nu_biz_employees_org a ON a.employees_id = e.id + LEFT JOIN sys_depart b ON a.org_code = b.org_code + WHERE e.tel = #{tel} AND a.iz_freeze = 'N' AND a.iz_history = 'N' AND b.status = '1' + UNION + SELECT + b.org_code as orgCode, + concat(CASE WHEN RIGHT(b.url, 1) = '/' THEN LEFT(b.url, LENGTH(b.url)) ELSE b.url END, b.context_path ) AS serverUrl, + b.depart_name + FROM sys_depart b + WHERE b.account_no = #{tel} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml index ea16ed1..c4e8382 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml @@ -59,13 +59,9 @@