From d9adbadd9fa14cb7174f6167c438a45e8176fd26 Mon Sep 17 00:00:00 2001
From: SZH <szh_hello@163.com>
Date: 星期四, 23 二月 2023 15:22:04 +0800
Subject: [PATCH] 数据库连接池移除druid atomikos分布式事务使用com.mysql.cj.jdbc.MysqlXADataSource

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

diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesMaintainServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesMaintainServiceImpl.java
index 19340d6..8c27628 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesMaintainServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesMaintainServiceImpl.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 batchDeleteEmergencySuppliesMaintain(String ids) {
-        if (StringUtils.isBlank(ids)) {
+    public ResultVO batchDeleteEmergencySuppliesMaintain(Long[] ids) {
+
+        if (ids == null ||  ids.length==0){
             throw new EmergencyException(EmergencyResultCodes.SUPPLIES_MAINTAIN_NULL);
-        } else {
-            String[] idArr = ids.split(",");
-            for (String id : idArr) {
-                deleteEmergencySuppliesMaintain(Long.valueOf(id));
+        }else{
+            for (Long id : ids){
+                deleteEmergencySuppliesMaintain(id);
             }
             return new ResultVO(ResultCodes.OK);
         }

--
Gitblit v1.9.2