From 3f130a318207d1ecb2891f425574d29cecdd1bc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Mon, 25 Apr 2022 15:39:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=B8=BA=E7=89=A9=E7=90=86=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EpidemicUserInfoController.java           |  6 +--
 .../impl/EpidemicUserInfoServiceImpl.java     | 41 ++++++++++---------
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoController.java
index 052774d..61e8c89 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoController.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoController.java
@@ -82,9 +82,9 @@ public class EpidemicUserInfoController {
     public Result delete(@RequestBody Long[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
-        epidemicUserInfoService.delete(ids);
-        return new Result();
-//        return epidemicUserInfoService.deleteUserById(ids);
+//        epidemicUserInfoService.delete(ids);
+//        return new Result();
+        return epidemicUserInfoService.deleteUserById(ids);
     }
 
     @GetMapping("export")
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
index 1a6fd47..61d9cb9 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
@@ -471,25 +471,28 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
      */
     @Override
     public Result deleteUserById(Long[] ids) {
-        //1、获取详情id
-        Long inoutRecord = ids[0];
-        if (null != inoutRecord) {
-            baseDao.deleteById(inoutRecord);
-//            //查询信息
-//            EpidemicUserInfoEntity entity = baseDao.selectByIdCard(inoutRecord);
-//            if (null == entity) {
-//                return new Result().error("数据错误，刷新后重试！！");
-//            }
-//            // 2、判断人员信息表中数据如果只有一条就全删
-//            Integer integer = inoutRecordDao.selectByState(entity.getIdCard());
-//            if (integer == 1) {
-//                // 若同时存在，则保留基础信息，删除额外信息。
-//                baseDao.deleteById(entity.getId());
-//            }
-//            inoutRecordDao.deleteById(inoutRecord);
-        } else {
-            return new Result().error("删除参数不正确,请联系管理员查看");
-        }
+
+        //物理删除
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+//        //1、获取详情id
+//        Long inoutRecord = ids[0];
+//        if (null != inoutRecord) {
+//            baseDao.deleteById(inoutRecord);
+////            //查询信息
+////            EpidemicUserInfoEntity entity = baseDao.selectByIdCard(inoutRecord);
+////            if (null == entity) {
+////                return new Result().error("数据错误，刷新后重试！！");
+////            }
+////            // 2、判断人员信息表中数据如果只有一条就全删
+////            Integer integer = inoutRecordDao.selectByState(entity.getIdCard());
+////            if (integer == 1) {
+////                // 若同时存在，则保留基础信息，删除额外信息。
+////                baseDao.deleteById(entity.getId());
+////            }
+////            inoutRecordDao.deleteById(inoutRecord);
+//        } else {
+//            return new Result().error("删除参数不正确,请联系管理员查看");
+//        }
         //根据情况进项删除
         return new Result();
     }