From 9654d2597527c72f2769c7adfcc9a6f1a7cf693f Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Tue, 13 May 2025 16:31:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E5=A4=B4bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicdata/mapper/xml/NoticeMapper.xml     | 22 ++++++++++---------
 .../worker/mapper/xml/WorkerInfoMapper.xml    |  4 ++--
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/NoticeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/NoticeMapper.xml
index b6460303b..d8754c15b 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/NoticeMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/NoticeMapper.xml
@@ -40,18 +40,20 @@
         join enterprise_info ei on ei.id=wi.enterprise_id
         where wi.project_sn=#{projectSn}
         and (ei.id=#{constructionUnit} or ei.id=#{epcContractor})
-        and su.user_id = (select r.user_id from base_role_user r join base_role br on br.role_id=r.role_id where br.role_name='施工经理')
+        and su.user_id in (select r.user_id from base_role_user r join base_role br on br.role_id=r.role_id where
+        br.role_name='施工经理')
     </select>
 
   <select id="getUserIdBySceneExposeSpecial2" resultType="java.lang.Long">
-        select
-        distinct su.user_id
-        from system_user su
-        join worker_info wi on wi.id=su.worker_id
-        join enterprise_info ei on ei.id=wi.enterprise_id
-        where wi.project_sn=#{projectSn}
-        and ei.id=#{supervisingUnit}
-        and su.user_id = (select r.user_id from base_role_user r join base_role br on br.role_id=r.role_id where br.role_name='总监')
-    </select>
+      select
+      distinct su.user_id
+      from system_user su
+      join worker_info wi on wi.id=su.worker_id
+      join enterprise_info ei on ei.id=wi.enterprise_id
+      where wi.project_sn=#{projectSn}
+      and ei.id=#{supervisingUnit}
+      and su.user_id in (select r.user_id from base_role_user r join base_role br on br.role_id=r.role_id where
+      br.role_name='总监')
+  </select>
 
 </mapper>
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml
index 67f12b839..90fbef6b7 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml
@@ -269,10 +269,10 @@
                 order by a.enter_date desc
             </when>
             <when test="param.orderBy == 'numAsc'.toString()">
-                order by a.num asc
+                ORDER BY CAST(REGEXP_SUBSTR(a.num, '[0-9]+$') AS UNSIGNED) asc
             </when>
             <when test="param.orderBy == 'numDesc'.toString()">
-                order by a.num desc
+                order by CAST(REGEXP_SUBSTR(a.num, '[0-9]+$') AS UNSIGNED) desc
             </when>
             <when test="param.orderBy == 'enterpriseNameAsc'.toString()">
                 order by en.enterprise_name asc