admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

包头bug修改

Browse Source
This commit is contained in:
guoshengxiong 2025-05-13 16:31:19 +08:00
parent 5b4034098d
commit 9654d25975
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/NoticeMapper.xml
View File

@ -40,18 +40,20 @@
join enterprise_info ei on ei.id=wi.enterprise_id join enterprise_info ei on ei.id=wi.enterprise_id
where wi.project_sn=#{projectSn} where wi.project_sn=#{projectSn}
and (ei.id=#{constructionUnit} or ei.id=#{epcContractor}) 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>
<select id="getUserIdBySceneExposeSpecial2" resultType="java.lang.Long"> <select id="getUserIdBySceneExposeSpecial2" resultType="java.lang.Long">
select select
distinct su.user_id distinct su.user_id
from system_user su from system_user su
join worker_info wi on wi.id=su.worker_id join worker_info wi on wi.id=su.worker_id
join enterprise_info ei on ei.id=wi.enterprise_id join enterprise_info ei on ei.id=wi.enterprise_id
where wi.project_sn=#{projectSn} where wi.project_sn=#{projectSn}
and ei.id=#{supervisingUnit} 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='总监') 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
</select> br.role_name='总监')
</select>
</mapper> </mapper>

4
src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml
View File

@ -269,10 +269,10 @@
order by a.enter_date desc order by a.enter_date desc
</when> </when>
<when test="param.orderBy == 'numAsc'.toString()"> <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>
<when test="param.orderBy == 'numDesc'.toString()"> <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>
<when test="param.orderBy == 'enterpriseNameAsc'.toString()"> <when test="param.orderBy == 'enterpriseNameAsc'.toString()">
order by en.enterprise_name asc order by en.enterprise_name asc