Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

6 months ago · ddc5340838
parent f4a7c2a606 e6902de5c7
commit ddc5340838
1 changed files with 1 additions and 1 deletions
--- a/src/main/resources/mybatis/mapper/basic/SysWorkplaceFreightMapper.xml
+++ b/src/main/resources/mybatis/mapper/basic/SysWorkplaceFreightMapper.xml
@ -6,7 +6,7 @@
    <select id="filterList" resultType="com.glxp.api.res.basic.SysWorkplaceFreightResponse">
        select swf.*,
        sw.workplaceName  workPlaceName,
-        COUNT(swl.freightCode) as layerCount,ccc.reCount
+        COUNT(swl.freightCode) as layerCount,ifnull(ccc.reCount,0) as reCount
        from sys_workplace_freight swf
        left join (
            select freightCode,count(freightCode), min(reCount) as reCount from