From 1f9b64476716a6a1de3bcb886bf4e64b123f7523 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 06 七月 2023 18:28:31 +0800
Subject: [PATCH] 管理台bug和用户端活动商品购买
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
index dd8f3a1..f966109 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
@@ -1,7 +1,6 @@
package com.ruoyi.system.controller.sys;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
import com.ruoyi.common.core.web.controller.BaseController;
@@ -13,27 +12,22 @@
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.dto.AppEditUserDto;
-import com.ruoyi.system.api.domain.poji.config.SysTag;
import com.ruoyi.system.api.domain.poji.sys.SysDept;
import com.ruoyi.system.api.domain.poji.sys.SysRole;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
-import com.ruoyi.system.api.model.AppMiniLoginVo;
import com.ruoyi.system.api.model.LoginUser;
-import com.ruoyi.system.api.model.QwH5LoginVo;
-import com.ruoyi.system.api.model.QwUserDetailDto;
-import com.ruoyi.system.service.config.SysTagService;
+import com.ruoyi.system.domain.dto.UserMenuEditDto;
import com.ruoyi.system.service.sys.*;
+import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
-import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
@@ -381,4 +375,25 @@
return R.ok();
}
+ @ApiOperation(value = "修改用户权限")
+ @Log(title = "用户管理", businessType = BusinessType.UPDATE,operContent = "修改用户权限")
+ @PostMapping("/editUserMenu")
+ public R editUserMenu(@RequestBody UserMenuEditDto userMenuEditDto){
+ userService.editUserMenu(userMenuEditDto);
+ return R.ok();
+ }
+
+ /**
+ * @description 冻结用户
+ * @author jqs
+ * @date 2023/6/29 17:20
+ * @param userId
+ * @return R<Activeness>
+ */
+ @PostMapping("/frozenUser")
+ public R frozenUser(@RequestBody Long userId)
+ {
+ userService.frozenUser(userId);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1