Merge branch 'dev-3.0.0' of portal-site-qinghai/portal-site-back into dev

unis-plugin/unis-plugin-dev/src/main/java/com/unis/dev/modular/job/task/IcPublicOpinionCollectTask.java

@@ -51,7 +51,7 @@ public class IcPublicOpinionCollectTask implements CommonTimerTaskRunner {
         List<IcPublicOpinionCollect> icPublicOpinionCollectList = icPublicOpinionCollectMapper
                 .selectList(Wrappers.lambdaQuery(IcPublicOpinionCollect.class)
                .eq(IcPublicOpinionCollect::getStatus, 2)
-                .eq(IcPublicOpinionCollect::getProgressStatus,0));
+                        .in(IcPublicOpinionCollect::getProgressStatus,0,1));
 
         if (CollectionUtils.isEmpty(icPublicOpinionCollectList)) {
             log.info("暂无找到符合条件的数据");
@@ -83,5 +83,8 @@ public class IcPublicOpinionCollectTask implements CommonTimerTaskRunner {
 
         }
 
+
+
+
     }
 }