Merge remote-tracking branch 'origin/develop_dl_bugfix_0723' into develop_dl_bugfix_0723

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -1126,7 +1126,7 @@
 
 	<select id="countData" resultType="long">
 		SELECT
-			count(1)
+			count(DISTINCT ppk.id)
 		FROM
 			`p_plan_task` ppk
 		LEFT JOIN p_plan pp ON pp.id = ppk.plan_id
@@ -1169,6 +1169,7 @@
 			<if test="param.routeId != null"> and ppk.route_id = #{param.routeId} </if>
 			<if test="param.bizOrgCode != null"> and pp.biz_org_code like concat('%',#{param.bizOrgCode},'%')  </if>
 		</where>
+		GROUP BY ppk.id
 		ORDER BY
 			ppk.begin_time DESC
 		<choose>