From dfc896f3418be7488c6c7cc7fd9984106849cc50 Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Tue, 9 Jan 2024 17:39:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=BB=AA=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/WxInstrumentMapper.xml          | 2 +-
 .../com/flossom/system/controller/WxInstrumentController.java | 2 +-
 flossom-ui/src/views/system/instrument/index.vue              | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml
index ccb6342..edd4fec 100644
--- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml
+++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml
@@ -234,7 +234,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteWxInstrumentByIds" parameterType="String">
-        delete from wx_instrument where id in 
+        UPDATE wx_instrument SET status = 1 where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxInstrumentController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxInstrumentController.java
index 42f320b..95fb830 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxInstrumentController.java
+++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxInstrumentController.java
@@ -116,7 +116,7 @@ public class WxInstrumentController extends BaseController {
     }
 
     /**
-     * 删除仪器列
+     * 隐藏仪器
      */
     @RequiresPermissions("system:instrument:remove")
     @Log(title = "仪器列", businessType = BusinessType.DELETE)
diff --git a/flossom-ui/src/views/system/instrument/index.vue b/flossom-ui/src/views/system/instrument/index.vue
index 0ae8837..2dd7da5 100644
--- a/flossom-ui/src/views/system/instrument/index.vue
+++ b/flossom-ui/src/views/system/instrument/index.vue
@@ -773,11 +773,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除仪器列编号为"' + ids + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认隐藏仪器列编号为"' + ids + '"的数据项？').then(function () {
         return delInstrument(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.$modal.msgSuccess("隐藏成功");
       }).catch(() => {
       });
     },