From 7598cb0b2625b2c4dcb05aeed213b423f8d0a625 Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Thu, 13 Jul 2023 16:20:36 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SystemUserController.java          | 14 ++------------
 .../basicdata/service/ISystemUserService.java     |  1 +
 .../service/impl/SystemUserServiceImpl.java       | 15 +++++++++++----
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java
index e25b87452..a63336a50 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java
@@ -109,18 +109,8 @@ public class SystemUserController {
     @ApiImplicitParam(name = "id", value = "账号ID", paramType = "query", required = true, dataType = "Integer")
     @PostMapping(value = "/delete")
     public Result<SystemUser> delete(@RequestBody Map<String, Object> map) {
-        Result<SystemUser> result = new Result<SystemUser>();
-        SystemUser systemUser = systemUserService.getById(MapUtils.getString(map, "id"));
-        if (systemUser == null) {
-            result.error500(MessageUtil.get("notFindErr"));
-        } else {
-            boolean ok = systemUserService.removeById(MapUtils.getString(map, "id"));
-            if (ok) {
-                result.successMsg(MessageUtil.get("deleteSucess"));
-            }
-        }
-
-        return result;
+        systemUserService.delete(map);
+        return Result.ok();
     }
 
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserService.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserService.java
index 9f0f29d1c..f181dba08 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserService.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserService.java
@@ -64,4 +64,5 @@ public interface ISystemUserService extends IService<SystemUser> {
 
     Result<List<SystemUser>> getZjwjUserList(SystemUser systemUser);
 
+    void delete(Map<String, Object> map);
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
index f7d3e6ec7..61df4aa3e 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
@@ -2,10 +2,6 @@ package com.zhgd.xmgl.modules.basicdata.service.impl;
 
 import cn.hutool.core.date.*;
 import cn.hutool.core.util.IdUtil;
-import cn.hutool.crypto.digest.HMac;
-import cn.hutool.crypto.digest.HmacAlgorithm;
-import cn.hutool.http.HttpRequest;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -939,4 +935,15 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
         return Result.success(list);
     }
 
+    @Override
+    public void delete(Map<String, Object> map) {
+        String id = MapUtils.getString(map, "id");
+        SystemUser systemUser = getById(id);
+        if (systemUser == null) {
+            throw new OpenAlertException(MessageUtil.get("notFindErr"));
+        } else {
+            removeById(id);
+            baseRoleUserMapper.delete(new LambdaQueryWrapper<BaseRoleUser>().eq(BaseRoleUser::getUserId, id));
+        }
+    }
 }