Merge branch 'master' of https://github.com/flipped-aurora/gin-vue-admin into gva_workflow

Conflicts: server/initialize/router.go server/router/sys_workflow.go
2020-11-23 18:14:43 +08:00
parent 1591944756 85fce8f01e
commit 8208ccf5a3
42 changed files with 435 additions and 286 deletions
@@ -216,6 +216,11 @@ func DeleteUser(c *gin.Context) {
 		response.FailWithMessage(err.Error(), c)
 		return
 	}
+	jwtId := getUserID(c)
+	if jwtId == uint(reqId.Id) {
+		response.FailWithMessage("删除失败, 自杀失败", c)
+		return
+	}
 	if err := service.DeleteUser(reqId.Id); err != nil {
 		global.GVA_LOG.Error("删除失败!", zap.Any("err", err))
 		response.FailWithMessage("删除失败", c)