From 83bd7054891311dfc86022a9a0ff2d9c5579865e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Fri, 10 Oct 2025 09:27:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96PAD=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=EF=BC=8C=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E6=89=80=E6=8B=A5?=
 =?UTF-8?q?=E6=9C=89=E7=9A=84=E6=9C=BA=E6=9E=84=E6=9C=8D=E5=8A=A1=E5=99=A8?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../employees/mapper/xml/EmployeesOrgMapper.xml      |  8 ++++----
 .../mapper/xml/NuEmployeesAdvisoryInfoMapper.xml     |  2 +-
 .../mq/employees/listener/EmployeesMQListener.java   | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

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 e96cbd4..f4ab969 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
@@ -5,14 +5,14 @@
     <select id="getEmployeesOrgListByEmpId" resultType="com.nu.modules.employees.entity.EmployeesOrg">
         SELECT
             a.org_code as orgCode,
-            concat(REGEXP_REPLACE(b.url, '/([^/]*)$', '\\'),b.context_path)  AS serverUrl
+            concat(CASE WHEN RIGHT(b.url, 1) = '/' THEN LEFT(b.url, LENGTH(b.url) - 1) ELSE b.url END, b.context_path )  AS serverUrl
         FROM nu_biz_employees_org a
         LEFT JOIN sys_depart b
         ON a.org_code = b.org_code
         WHERE a.employees_id = #{employeesId}
-        AND a.status = '2'
-        AND a.iz_history = '1'
-        AND a.iz_freeze = '0'
+          AND a.iz_freeze = '0'
+          AND a.iz_history = '1'
+          AND (a.status = '2' or a.apply_type = '2')
     </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 63bf350..a691d16 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
@@ -56,7 +56,7 @@
     <select id="getEmployeeInfoByTel" resultType="com.nu.modules.employees.entity.NuEmployeesAdvisoryInfo">
         SELECT
             adinfo.*,
-            concat(REGEXP_REPLACE(sd.url, '/([^/]*)$', '\\'),sd.context_path)  AS serverUrl
+            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_employees_advisory_info adinfo
         LEFT JOIN sys_depart sd
         ON adinfo.last_login_org = sd.org_code
diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java
index de04eeb..7d6b64a 100644
--- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java
+++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java
@@ -99,9 +99,9 @@ public class EmployeesMQListener {
                 }else{
                     UpdateWrapper<EmployeesOrg> uwOrg = new UpdateWrapper<>();
                     uwOrg.eq("employees_id", dto.getEmployeeId());
-                    uwOrg.eq("status", "2");//审批通过
-                    uwOrg.eq("iz_history", "1");//非历史
                     uwOrg.eq("iz_freeze", "0");//未冻结
+                    uwOrg.eq("iz_history", "1");//非历史
+                    uwOrg.and(c -> c.eq("apply_type","2").or().eq("status","2"));//审批通过
                     uwOrg.eq("org_code", employeesAd.getLastLoginOrg());//机构
                     EmployeesOrg empOrg = employeesOrgService.getOne(uwOrg);
                     if(empOrg!=null){
@@ -151,9 +151,9 @@ public class EmployeesMQListener {
     public void handleSysuserPwd(SysUserMQDto dto) {
         UpdateWrapper<EmployeesOrg> uw = new UpdateWrapper<>();
         uw.eq("employees_id", dto.getEmployeeId());
-        uw.eq("status", "2");//审批通过
-        uw.eq("iz_history", "1");//非历史
         uw.eq("iz_freeze", "0");//未冻结
+        uw.eq("iz_history", "1");//非历史
+        uw.and(c -> c.eq("apply_type","2").or().eq("status","2"));//审批通过
         List<EmployeesOrg> list = employeesOrgService.list(uw);
         if(list.size()>0){
             for(int i=0;i<list.size();i++){
@@ -209,9 +209,9 @@ public class EmployeesMQListener {
             }else{
                 UpdateWrapper<EmployeesOrg> uwOrg = new UpdateWrapper<>();
                 uwOrg.eq("employees_id", dto.getEmployeeId());
-                uwOrg.eq("status", "2");//审批通过
-                uwOrg.eq("iz_history", "1");//非历史
                 uwOrg.eq("iz_freeze", "0");//未冻结
+                uwOrg.eq("iz_history", "1");//非历史
+                uwOrg.and(c -> c.eq("apply_type","2").or().eq("status","2"));//审批通过
                 uwOrg.eq("org_code", employeesAd.getLastLoginOrg());//机构
                 EmployeesOrg empOrg = employeesOrgService.getOne(uwOrg);
                 if(empOrg!=null){