diff --git a/resources/mybatis/index/IndexHomeDetailsMapper.xml b/resources/mybatis/index/IndexHomeDetailsMapper.xml index 893f92b..b0e7ba3 100644 --- a/resources/mybatis/index/IndexHomeDetailsMapper.xml +++ b/resources/mybatis/index/IndexHomeDetailsMapper.xml @@ -960,7 +960,7 @@ LEFT JOIN wf_info_record wir ON wte.ID = wir.SUP_ID WHERE wir.TYPE = 2 - AND wtr.IS_ACTIVE = 1 + AND wtr.IS_ACTIVE = 1 AND bp.IS_ACTIVE = 1 and wla.PROJECT = #{projectId} @@ -995,7 +995,7 @@ LEFT JOIN bm_company bc on bp.COMPANY_ID = bc.ID LEFT JOIN wf_return_material_details wrd ON wtr.ID = wrd.TASK_ID LEFT JOIN wf_info_record wir ON wrd.ID = wir.SUP_ID - WHERE wtr.IS_ACTIVE = 1 AND wir.TYPE = 4 + WHERE wtr.IS_ACTIVE = 1 AND wir.TYPE = 4 AND bp.IS_ACTIVE = 1 and wla.PROJECT = #{projectId} @@ -1064,7 +1064,7 @@ LEFT JOIN wf_info_record wir ON wte.ID = wir.SUP_ID WHERE wir.TYPE = 2 - AND wtr.IS_ACTIVE = 1 + AND wtr.IS_ACTIVE = 1 AND bp.IS_ACTIVE = 1 GROUP BY wla.ID UNION SELECT @@ -1105,7 +1105,7 @@ LEFT JOIN wf_info_record wir ON wrd.ID = wir.SUP_ID WHERE wtr.IS_ACTIVE = 1 - AND wir.TYPE = 4 + AND wir.TYPE = 4 AND bp.IS_ACTIVE = 1 GROUP BY wla.ID ) a @@ -1120,7 +1120,7 @@ GROUP BY - a.projectName + a.ID order by diffCount,subName desc