Merge branch 'feature-daiban-12-14' into 'developer'

待办以及消息

See merge request !138

haoban-manage3-service/src/main/resources/mapper/PendingTaskMapper.xml

@@ -254,7 +254,7 @@
         <if test="clerkId != null">
             and clerk_id = #{clerkId}
         </if>
-        <if test="taskType != null">
+        <if test="taskType!=-1">
             and task_type = #{taskType}
         </if>
         order by overdue_time desc