。。

src/main/java/com/chinaitop/depot/statisticalReport/mapper/StatisticalReportMapper.xml

@@ -44,7 +44,7 @@
     	td.outh, td.t_max maxtemp, td.t_min mintemp, td.t_avg avgtemp, bs.remark, sq.water, 
     	keeps.user_alias dutystoreman, sq.location
 	FROM basic_storehouse bs
-	LEFT JOIN storage_qualitycheck sq on bs.storehouse_id = sq.house_id AND sq.org_id = bs.org_id and sq.type = 0
+	LEFT JOIN storage_qualitycheck sq on bs.storehouse_id = sq.house_id AND sq.org_id = bs.org_id <!-- and sq.type = 0 -->
 	LEFT JOIN (
 		SELECT concat(c.user_alias) user_alias,a.house_id FROM basic_keeper_house a
 		INNER JOIN basic_keeper b on a.keeper_Id = b.id
@@ -61,7 +61,7 @@
 			    and STR_TO_DATE(t_time, '%Y-%m-%d') = #{startDate}
 		    </if>
 		    GROUP BY storehouse
-		  ) b on a.storehouse = b.storehouse and a.t_time = b.t_time and a.org_id = 49
+		  ) b on a.storehouse = b.storehouse and a.t_time = b.t_time and a.org_id = ${orgId}
 	) td on bs.storehouse_code = td.storehouse
 	<where>
 		<if test="orgId!=null">