From c4354b452cb7b09fe28a9e8ea81f455df1c68de8 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 05 八月 2022 17:02:59 +0800
Subject: [PATCH] 流程fix

---
 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java
index 4d0ff35..b8a24ff 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java
@@ -60,7 +60,7 @@
         return new SearchResultVO<>(
                 true,
                 pageIndex,
-                pageSize,
+                pageSize,page.getPages(),
                 page.getTotal(),
                 respList,
                 ResultCodes.OK
@@ -196,13 +196,12 @@
     }
 
     @Override
-    public ResultVO batchDeleteEmergencyDrillExecute(String ids) {
-        if (StringUtils.isBlank(ids)) {
+    public ResultVO batchDeleteEmergencyDrillExecute(Long[] ids) {
+        if (ids == null ||  ids.length==0){
             throw new EmergencyException(EmergencyResultCodes.DRILL_EXECUTE_NULL);
-        } else {
-            String[] idArr = ids.split(",");
-            for (String id : idArr) {
-                deleteEmergencyDrillExecute(Long.valueOf(id));
+        }else{
+            for (Long id : ids){
+                deleteEmergencyDrillExecute(id);
             }
             return new ResultVO(ResultCodes.OK);
         }

--
Gitblit v1.9.2