Merge remote-tracking branch 'liujiankang/master'

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/ptsBatchMapper.xml

@@ -62,6 +62,9 @@
             <if test="batchId !=null and batchId !=''">
                 AND t.batch_id = #{batchId}
             </if>
+            <if test="batchStatus !=null and batchStatus !=''">
+                AND t.batch_status = #{batchStatus}
+            </if>
         </where>
     </select>
 

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machinePtras/parts_list.ftl

@@ -35,7 +35,7 @@
 
             <select class="my-select" name="supplierId" id="supplierId" style="height: 36px;width: 150px">
                 <option value ="">所有供应商</option>
-                <#if (listSupplier ?size > 0)>
+                <#if listSupplier?? && (listSupplier ?size > 0)>
                     <#list listSupplier as list>
                         <option value ="${list.supplierId}" <#if supplierId??><#if supplierId ==list.supplierId >selected="selected"</#if></#if> >${list.supplierName}</option>
                     </#list>