From 206b2a8034f066f7f4d08755abfee3f5049d0632 Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Tue, 17 May 2022 11:10:26 +0800
Subject: [PATCH] Merge branch 'developer' into alpha

---
 zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java
index d71a0a0..1bc056e 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java
@@ -7,13 +7,13 @@
 import com.matrix.core.pojo.PaginationVO;
 import com.matrix.core.tools.DateUtil;
 import com.matrix.core.tools.LogUtil;
+import com.matrix.core.tools.StringUtils;
 import com.matrix.core.tools.WebUtil;
 import com.matrix.core.tools.excl.ExcelSheetPO;
 import com.matrix.core.tools.excl.ExcelUtil;
 import com.matrix.core.tools.excl.ExcelVersion;
 import com.matrix.system.common.bean.SysUsers;
 import com.matrix.system.common.bean.SystemDictionary;
-import com.matrix.system.common.constance.AppConstance;
 import com.matrix.system.common.dao.CustomerDataDictionaryDao;
 import com.matrix.system.common.service.SysUsersService;
 import com.matrix.system.common.service.SystemDictionaryService;
@@ -334,8 +334,14 @@
     @RequestMapping(value = "/del")
     public @ResponseBody
     AjaxResult del(String keys) {
-
-        return remove(vipInfoService, keys);
+            List<Long> ids = StringUtils.strToCollToLong(keys, ",");
+            int i = vipInfoService.removeLogic(ids);
+            if (i > 0) {
+                return new AjaxResult(AjaxResult.STATUS_SUCCESS, "成功删除" + i + "条数据");
+            } else {
+                return new AjaxResult(AjaxResult.STATUS_FAIL, "删除失败");
+            }
+//        return remove(vipInfoService, keys);
     }
 
     /**

--
Gitblit v1.9.1