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 + 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='总监') + 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 - order by a.num asc + ORDER BY CAST(REGEXP_SUBSTR(a.num, '[0-9]+$') AS UNSIGNED) asc - order by a.num desc + order by CAST(REGEXP_SUBSTR(a.num, '[0-9]+$') AS UNSIGNED) desc order by en.enterprise_name asc