用户管理模块用户删除问题

src/main/java/com/liang/controller/SysUserInfoController.java

@@ -290,13 +290,15 @@ public class SysUserInfoController extends BaseController {
             logger.info("batchDelete -- idList：{}", userIdList);
         }
         int a = 0;
+        Map<Object,Object> map =new HashMap<>();
         // 批量判断 问题
         // 判断删除人员是否有部门信息
-        if (userIdList.size() > 1){
+        if (userIdList.size() > 0){
             for (int i =0 ; i<userIdList.size();i++){
                 // 查询当前人员岗位是非为空
-                List<String> postName = sysUserInfoService.getPostNameByUserId(userIdList.get(i));
-                if (postName.size() == 0){
+                map.put("id",userIdList.get(i));
+                List<SysUserInfo> sysUserInfos = sysUserInfoService.getSysUserInfoList(map);
+                if (sysUserInfos.size()==1 && sysUserInfos.get(0).getUserPostName() == null){
                     int num = sysUserInfoService.batchDelete(userIdList, getSysUserId());
                     if (num > 0) {
                         a++;
@@ -306,9 +308,9 @@ public class SysUserInfoController extends BaseController {
             }
         }
         if (a == 0){
-            return BaseResult.failure("批量删除失败! 该人员岗位信息不为空");
+            return BaseResult.failure(-1,"删除失败!请先删除当前人员岗位信息！");
         }
-        return BaseResult.success("批量删除成功");
+        return BaseResult.success("删除成功");
     }
 
     /**

src/main/resources/mapper/SysUserInfoDao.xml

@@ -268,14 +268,30 @@
 
     <!--查询所有用户-->
     <select id="getSysUserInfoList" resultMap="SysUserInfoMap" parameterType="map">
-        select u.*, d.dept_name as deptName, p.post_name as userPostName
-        from sys_user_info u
-        left join sys_dept_info d on d.dept_id = u.dept_id
-        left join sys_user_post up on up.user_id = u.user_id
-        left join sys_post_info p on p.post_id = up.post_id
-        where u.del_flag = 0
+        WITH RankedData AS (
+        SELECT
+        u.user_id,
+        u.account,
+        u.create_time,
+        u.sex,
+        u.name,
+        u.phone,
+        u.status,
+        d.dept_name AS deptName,
+        p.post_name,
+        ROW_NUMBER() OVER (PARTITION BY u.user_id ORDER BY u.user_id) AS rn
+        FROM
+        sys_user_info u
+        LEFT JOIN
+        sys_dept_info d ON d.dept_id = u.dept_id
+        LEFT JOIN
+        sys_user_post up ON up.user_id = u.user_id
+        LEFT JOIN
+        sys_post_info p ON p.post_id = up.post_id
+        WHERE
+        u.del_flag = 0
         <if test="account != null and account != ''">
-            and u.account = #{account}
+            and u.account like '%'+#{account}+'%'
         </if>
         <if test="name != null and name != ''">
             and u.name like '%'+#{name}+'%'
@@ -295,14 +311,25 @@
         <if test="ssbm != null and ssbm != ''">
             and d.dept_id = #{ssbm}
         </if>
-        <choose>
-            <when test="sortName != null and sortName != '' and sortOrder != null and sortOrder != ''">
-                order by ${sortName} ${sortOrder}
-            </when>
-            <otherwise>
-                order by u.user_id asc
-            </otherwise>
-        </choose>
+        )
+        SELECT
+        user_id,
+        account,
+        status,
+        deptName,
+        phone,
+        create_time,
+        sex,
+        name,
+        STUFF((SELECT '、' + post_name
+        FROM RankedData sub
+        WHERE sub.user_id = main.user_id
+        AND sub.rn > 0
+        FOR XML PATH('')), 1, 1, '') AS userPostName
+        FROM
+        RankedData main
+        WHERE
+        rn = 1;
     </select>
 
     <!--查询用户-->

src/main/resources/templates/userinfo/list.html

@@ -244,10 +244,10 @@
             defaultToolbar: ['filter', 'exports', 'print'],
             cols: [
                 [
-                    {type: "checkbox", fixed: 'left'},
-                    {type: 'numbers', fixed: 'left'},
+                    {type: "radio", fixed: 'left',title:'😊'},
+                    {type: 'numbers', fixed: 'left',title: '序号'},
                     {field: 'account', width: '8%', title: '账号', sort: true},
-                    {field: 'name', width: '8%', title: '姓名', sort: true},
+                    {field: 'name', width: '8%', title: '用户名', sort: true},
                     {field: 'sex', width: '5%', title: '性别', templet: '#sexTpl', align: 'center'},
                     // {
                     //     field: 'avatar', title: '头像', width: '6%', templet: function (d) {
@@ -305,7 +305,8 @@
                 "account": '',
                 "name": '',
                 'deptName': '',
-                'status': ''
+                'status': '',
+                'userPostName':''
             });
             // 执行搜索重载
             currTable.reload({
@@ -406,38 +407,51 @@
                     });
                 }
             } else if (obj.event === 'delete') {  // 监听删除操作
-                var checkStatus = table.checkStatus('currentTableId')
-                    , data = checkStatus.data;
-                if (data == null || data.length === 0) {
+                    var checkStatus = table.checkStatus('currentTableId')
+                        , data = checkStatus.data;
+                    if (data == null || data.length === 0) {
                     Message.warning("请选择要删除的用户！", 1000);
                     return;
                 }
-
                 var userIds = [];
                 for (var i = 0, len = data.length; i < len; i++) {
                     userIds.push(data[i].userId);
                 }
-                layer.confirm('确定批量删除用户吗？', function (index) {
-                    layer.close(index);
+                layer.confirm('确定要删除当前账号吗？', {
+                    title: '注意！',
+                    btn: ['确定', '取消']
+                }, function () {
+                    // 用户点击确定按钮后的回调函数
+                    console.log('执行退出账号操作');
                     AjaxUtil.post({
                         url: AjaxUtil.ctx + "userinfo/batchDelete",
                         contentType: "application/json",
                         data: JSON.stringify(userIds),
                         success: function (res) {
-                            if (res.code === 0) {
-                                Message.success(1500, res.message, function () {
+                            if (res.code == 0) {
+                                layer.msg(res.message,{icon:1},function () {
                                     // 重载表格
                                     currTable.reload();
                                 });
-                            } else {
-                                Message.error(res.message, 1000);
+                            } else if (res.code == -1){
+                                layer.msg(res.message, {icon:2});
+                                return;
                             }
                         },
                         error: function (error) {
                         }
                     });
+                    // 这里添加真实的退出账号逻辑，例如发送AJAX请求到服务器
+                }, function () {
+                    // 用户点击取消按钮后的回调函数
+                    console.log('已取消删除账号');
                 });
 
+              /*  layer.confirm('确定删除用户吗？', function (index) {
+                    layer.close(index);
+
+                });*/
+
                 // layer.alert(JSON.stringify(data));
             } else if (obj.event === 'downloadPdf') {
                 console.log("点击下载pdf");