Merge remote-tracking branch 'origin/master'

op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml

@@ -146,7 +146,7 @@
 
 	<select id="selectTaskRecord" parameterType="String" resultMap="EquOrderResult">
 		<include refid="selectEquOrderVo"/>
-		where del_flag = '0' and order_status = '1' and plan_type = #{planType} and order_code in (
+		where del_flag = '0' and order_status = '1' and plan_type = #{planType} and plan_person = #{userId} and order_code in (
 		select order_code from equ_order_person where del_flag = '0' and user_name = #{userId} GROUP BY order_code
 		)
 	</select>