Merge remote-tracking branch 'origin/master'

src/main/resources/mybatis/business/BizProductionPlanDetailMapper.xml

@@ -54,11 +54,13 @@
     <!--<select id="getDayWorkLot" resultType="Integer" >-->
     <!--    select count(1) FROM biz_daywork where production_plan_detail_id = #{id}-->
     <!--</select>-->
+
     <select id="getList" resultMap="BizProductionPlanDetailResult">
         SELECT t.* FROM biz_production_plan_detail t
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t.deleted = 0
             <if test="id != null">AND id = #{id}</if>
+            <if test="deptId != null  and deptId != 0">AND t.requisition_department_id = #{deptId}</if>
             <if test="keywords != null and keywords !=''">AND t.`product_description` LIKE CONCAT('%', #{keywords}, '%')
             </if>
             <if test="keyword != null and keyword !=''">AND (t.`product_description` LIKE CONCAT('%', #{keyword}, '%')