From bf1563dbb4a19380daa610eeb7d49fc4b47282e0 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 14 Aug 2020 15:15:16 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
index 48676b1..75f2a9a 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
@@ -328,7 +328,20 @@
boolean v = appUserService.delUser(id);
return ResultBody.ok().msg("删除成功").data(v);
}
-
+ /**
+ * 删除用户 不删除关系表 ，role_user 表 和 用户组织
+ *
+ * @param id
+ */
+ @DeleteMapping(value = "/users/deleteNoContact/{id}")
+ //@AuditLog(operation = "'删除用户:' + #id")
+ public ResultBody deleteNoContact(@PathVariable Long id) {
+ if (checkAdmin(id)) {
+ return ResultBody.failed(ADMIN_CHANGE_MSG);
+ }
+ boolean v = appUserService.deleteNoContact(id);
+ return ResultBody.ok().msg("删除成功").data(v);
+ }
/**
* 新增or更新
--
Gitblit v1.8.0