From 33b3931e87fb63843332160b40669cc16dbcb267 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Fri, 27 Mar 2026 10:48:00 +0800
Subject: [PATCH] =?UTF-8?q?pad=E7=AB=AF=E5=91=98=E5=B7=A5=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E5=8F=AF=E4=BB=A5=E4=BD=BF=E7=94=A8=E6=9C=BA=E6=9E=84?=
 =?UTF-8?q?=E5=8A=A0=E7=9B=9F=E6=97=B6=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E7=9A=84=E7=AE=A1=E7=90=86=E5=91=98=E8=B4=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../employees/mapper/EmployeesOrgMapper.java      |  2 +-
 .../employees/mapper/xml/EmployeesOrgMapper.xml   | 15 +++++++++++----
 .../mapper/xml/NuEmployeesAdvisoryInfoMapper.xml  | 10 +++-------
 .../employees/service/IEmployeesOrgService.java   |  2 +-
 .../service/impl/EmployeesOrgServiceImpl.java     |  4 ++--
 .../impl/NuEmployeesAdvisoryInfoServiceImpl.java  |  2 +-
 6 files changed, 19 insertions(+), 16 deletions(-)

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<EmployeesOrg> {
-    List<EmployeesOrg> getEmployeesOrgListByEmpId(@Param("employeesId") String employeesId);
+    List<EmployeesOrg> 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}
     </select>
 
 </mapper>
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 @@
     </select>
 
     <select id="getEmployeeInfoByTel" resultType="com.nu.modules.employees.entity.NuEmployeesAdvisoryInfo">
-        SELECT
-            adinfo.*,
-            concat(CASE WHEN RIGHT(sd.url, 1) = '/' THEN LEFT(sd.url, LENGTH(sd.url) - 1) ELSE sd.url END, sd.context_path )  AS serverUrl
-        FROM nu_biz_employees_advisory_info adinfo
-        LEFT JOIN sys_depart sd
-        ON adinfo.last_login_org = sd.org_code
-        WHERE adinfo.tel = #{tel}
+        SELECT adinfo.tel FROM nu_biz_employees_advisory_info adinfo WHERE adinfo.tel = #{tel}
+        UNION
+        SELECT sd.account_no as tel FROM sys_depart sd WHERE sd.account_no = #{tel}
     </select>
 
     <select id="queryEmployeeInfoById" resultType="com.nu.modules.employees.entity.NuEmployeesAdvisoryInfo">
diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/IEmployeesOrgService.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/IEmployeesOrgService.java
index d4ceba3..c1c2fd3 100644
--- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/IEmployeesOrgService.java
+++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/IEmployeesOrgService.java
@@ -12,5 +12,5 @@ import java.util.List;
  * @Version: V1.0
  */
 public interface IEmployeesOrgService extends IService<EmployeesOrg> {
-    List<EmployeesOrg> getEmployeesOrgListByEmpId(String employeesId);
+    List<EmployeesOrg> getEmployeesOrgListByEmpId(String tel);
 }
diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/EmployeesOrgServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/EmployeesOrgServiceImpl.java
index fe13d60..4c8cd67 100644
--- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/EmployeesOrgServiceImpl.java
+++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/EmployeesOrgServiceImpl.java
@@ -182,7 +182,7 @@ public class EmployeesOrgServiceImpl extends ServiceImpl<EmployeesOrgMapper, Emp
     }
 
     @Override
-    public List<EmployeesOrg> getEmployeesOrgListByEmpId(String employeesId){
-        return baseMapper.getEmployeesOrgListByEmpId(employeesId);
+    public List<EmployeesOrg> getEmployeesOrgListByEmpId(String tel){
+        return baseMapper.getEmployeesOrgListByEmpId(tel);
     }
 }
diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java
index d2f0fd1..bcb798f 100644
--- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java
+++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java
@@ -210,7 +210,7 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl<NuEmployeesA
         NuEmployeesAdvisoryInfo entity = baseMapper.getEmployeeInfoByTel(tel);
         if (entity != null) {
             resultData.set("data", entity);
-            List<EmployeesOrg> list = employeesOrgService.getEmployeesOrgListByEmpId(entity.getId());
+            List<EmployeesOrg> list = employeesOrgService.getEmployeesOrgListByEmpId(entity.getTel());
             resultData.set("orgList", list);
         } else {
             resultData.set("code", "1");