From 5352216ea7aafb9d184e2c8b05bfcee278e18415 Mon Sep 17 00:00:00 2001
From: 19173159168 <majian314@163.com>
Date: Sun, 27 Jul 2025 16:08:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E8=BD=A6=E7=94=A8=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/baseUser/ZcBaseUserMapper.xml  | 5 +++--
 .../src/main/resources/templates/baseUser/user/user.html     | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseUserMapper.xml b/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseUserMapper.xml
index 10dc3b7..5473793 100644
--- a/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseUserMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseUserMapper.xml
@@ -25,7 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectZcBaseUserList" parameterType="ZcBaseUser" resultMap="ZcBaseUserResult">
         <include refid="selectZcBaseUserVo"/>
-        <where>  
+        <where>
+            del_flag = '0'
             <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
             <if test="avatarUrl != null  and avatarUrl != ''"> and avatar_url = #{avatarUrl}</if>
             <if test="password != null  and password != ''"> and password = #{password}</if>
@@ -95,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteZcBaseUserByIds" parameterType="String">
-        delete from zc_base_user where id in 
+        update zc_base_user set del_flag = '2' where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
diff --git a/ruoyi-admin/src/main/resources/templates/baseUser/user/user.html b/ruoyi-admin/src/main/resources/templates/baseUser/user/user.html
index 5868552..2f45b8f 100644
--- a/ruoyi-admin/src/main/resources/templates/baseUser/user/user.html
+++ b/ruoyi-admin/src/main/resources/templates/baseUser/user/user.html
@@ -68,7 +68,7 @@
                 exportUrl: prefix + "/export",
                 modalName: "租车用户信息",
                 columns: [{
-                    checkbox: true
+                    checkbox: false
                 },
                 {
                     field: 'id',