Merge branch 'dev' into pre-production

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.xml

@@ -65,7 +65,7 @@
         <if test="pid != null and pid != 0">
             and p_id = #{pid}
         </if>
-        <if test="exAdminDeptId != null and exAdminDeptId != ''">
+        <if test="list != null and list != ''">
             and examine_dept_id in
             <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
                 #{item}