From 5703d0e9865df3ba05bb02bc382ce59fbf5f7da0 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 12 八月 2022 16:59:06 +0800
Subject: [PATCH] Merge branch 'genchuang' of https://sinanoaq.cn:8888/r/safePlatform-out into master
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesInspectServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesInspectServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesInspectServiceImpl.java
index 5ad5ab6..bf8433d 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesInspectServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesInspectServiceImpl.java
@@ -60,7 +60,7 @@
return new SearchResultVO<>(
true,
pageIndex,
- pageSize,
+ pageSize,page.getPages(),
page.getTotal(),
respList,
ResultCodes.OK
@@ -195,13 +195,13 @@
}
@Override
- public ResultVO batchDeleteEmergencySuppliesInspect(String ids) {
- if (StringUtils.isBlank(ids)) {
+ public ResultVO batchDeleteEmergencySuppliesInspect(Long[] ids) {
+
+ if (ids == null || ids.length==0){
throw new EmergencyException(EmergencyResultCodes.SUPPLIES_INSPECT_NULL);
- } else {
- String[] idArr = ids.split(",");
- for (String id : idArr) {
- deleteEmergencySuppliesInspect(Long.valueOf(id));
+ }else{
+ for (Long id : ids){
+ deleteEmergencySuppliesInspect(id);
}
return new ResultVO(ResultCodes.OK);
}
--
Gitblit v1.9.2