Merge branch 'master' of http://code.nyzhwlw.com:3000/com_yunfei_saas/agmp_fms

src/main/resources/mapper/FmsTaskrcdMapper.xml

@@ -45,11 +45,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN WmsGoods g ON g.goodsId = ag.goodsId
         LEFT JOIN FmsMach AS ma ON m.machId = ma.machId
         LEFT JOIN WmsWarehouse AS h ON t.warehouseId = h.warehouseId
-        LEFT JOIN SysRes AS r ON t.taskrcdId = r.resBusId
+        LEFT JOIN (select * from SysRes where resMediatype = '1' and tid = #{tid}) AS r ON t.taskrcdId = r.resBusId
         LEFT JOIN SysUser AS u ON t.taskrcdAuditor = u.userId
         LEFT JOIN FmsTask ft on ft.taskId = t.taskId
         <where>
-            r.resMediatype = '1' and t.tid = #{tid}
+            t.tid = #{tid}
             <if test="taskId != null  and taskId != ''"> and t.taskId = #{taskId}</if>
             <if test="taskrcdAuditstatus != null  and taskrcdAuditstatus != ''"> and t.taskrcdAuditstatus = #{taskrcdAuditstatus}</if>
             <if test="dataFilter == true and blockIds != null and blockIds.size() > 0">