浏览代码

验证当前账号正在使用,不能删除

lhy 1 年之前
父节点
当前提交
c8677c59a9

+ 12 - 1
src/main/groovy/com/jd/brume/controller/UserController.groovy

@@ -1,11 +1,14 @@
 package com.jd.brume.controller
 
 import cn.hutool.core.codec.Base64
+import cn.hutool.json.JSONObject
 import com.jd.brume.common.annotation.Log
 import com.jd.brume.common.enums.Module
 import com.jd.brume.common.enums.OpertateType
+import com.jd.brume.util.TokenUtil
 
 import javax.annotation.Resource
+import javax.servlet.http.HttpServletRequest
 import javax.validation.constraints.NotNull
 
 import org.springframework.validation.annotation.Validated
@@ -125,7 +128,15 @@ class UserController {
 	 */
 	@Log(title = Module.USER, opertateType = OpertateType.DELETE)
 	@DeleteMapping('delete')
-	def deleteUser(@NotNull Integer userId) {
+	def deleteUser(@NotNull Integer userId, HttpServletRequest req) {
+		if(userId == null){
+			return new Result().msg(100, '删除失败,参数缺失')
+		}
+		JSONObject loignParams = TokenUtil.getParamStr(['userId'], req)
+		Integer loginUserId = loignParams.getInt('userId', null)
+		if(loginUserId != null && loginUserId.intValue() == userId.intValue()){
+			return new Result().msg(100, '删除失败,当前账号正在使用,不能删除')
+		}
 		return new Result().ok(userService.removeById(userId))
 	}
 	

+ 1 - 1
src/main/resources/static/web/js/user.js

@@ -149,7 +149,7 @@ const initClick = () => {
 			}, (index) => {
 				layui.api.delete(obj.data.userId, 
 					(json) => {
-						layui.customUtil.refush(json.result, '删除成功', '删除失败', {
+						layui.customUtil.refush(json.result, '删除成功', json.msg, {
 							roleId: $('#RoleSel').val(),
 							deptId: $('#deptSel').val(),
 							queryVal: $('input[name="search"]').val()

+ 2 - 2
src/main/resources/static/web/view/user.html

@@ -55,10 +55,10 @@
 					</div>
 				</div>
 				<div class="layui-form-item">
-					<label class="layui-form-label">再次输入</label>
+					<label class="layui-form-label">确认密码</label>
 					<div class="layui-input-block">
 						<input type="password" name="repeatPass" autocomplete="off"
-							placeholder="请输入密码"  class="layui-input">
+							placeholder="请输入确认密码"  class="layui-input">
 					</div>
 				</div>
 				<div class="layui-form-item">