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

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/NotifyController.java

@@ -57,6 +57,9 @@ public class NotifyController extends WebBaseController {
         if (qo.getFilterStatus() == 1) {
             pendingListQDTO.setOverdueFlag(1);
         }
+        if (qo.getShowSelf()==0) {
+            pendingListQDTO.setClerkId(null);
+        }
         ServiceResponse<Page<PendingTaskDetailDTO>> retPage = pendingTaskApiService.pagePendingTask(pendingListQDTO, qo.getBasePageInfo());
 
         PageResult2 pageInfo = PageUtil.getPageInfo(retPage.getResult());