Merge remote-tracking branch 'origin/main'

data/pom.xml

@@ -122,12 +122,10 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <scope>test</scope>
         </dependency>
 
     </dependencies>

project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java

@@ -1035,7 +1035,7 @@ public class TaskServiceImpl implements ITaskService {
             jsonObject.put("data", new ArrayList<>());
             return SdmResponse.success(jsonObject);
         }
-
+        jsonObject.put("total", allTaskVoList.size());
         taskVoList = allTaskVoList.stream().skip((long) (req.getCurrent() - 1) * req.getSize()).limit(req.getSize()).toList();
         if (CollectionUtils.isEmpty(taskVoList)) {
             log.error("数据分析中未查询到任务信息");
@@ -1089,7 +1089,6 @@ public class TaskServiceImpl implements ITaskService {
         }
         jsonObject.put("currentPage", req.getCurrent());
         jsonObject.put("pageSize", req.getSize());
-        jsonObject.put("total", taskVoList.size());
         jsonObject.put("data", taskVoList);
         return SdmResponse.success(jsonObject);
     }