Merge remote-tracking branch 'origin/dev/20200522temp' into test

src/main/resources/mapper/QcresultInfoMapper.xml

@@ -680,7 +680,7 @@
             AND a.beh_dept_name = #{filterPageByDeptVO.deptName}
         </if>
         <if test="filterPageByDeptVO.name != null and filterPageByDeptVO.name != ''">
-            AND e.name like CONCAT('%', #{filterPageVO.name},'%')
+            AND e.name like CONCAT('%', #{filterPageByDeptVO.name},'%')
         </if>
         GROUP BY
         e.id,