From 7f00ce85fa689f8271e07375590d4f647dedd1a6 Mon Sep 17 00:00:00 2001
From: bunny <1319900154@qq.com>
Date: Mon, 25 Mar 2024 23:02:02 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E4=BF=AE=E6=94=B9):=20=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=A4=B4=E5=83=8F=E6=B2=A1=E6=9C=89=E5=86=99=E5=85=A5=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=EF=BC=8C=E7=94=A8=E6=88=B7=E9=80=80=E5=87=BA?=
 =?UTF-8?q?=E5=92=8C=E6=9F=A5=E8=AF=A2=E8=8F=9C=E5=8D=95=E4=B8=A2=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: bunny <1319900154@qq.com>
---
 .../spzx/manger/controller/IndexController.java     | 13 +++++++++++++
 .../spzx/manger/controller/SysUserController.java   |  6 +++---
 .../src/main/resources/mapper/SysUserMapper.xml     |  3 +++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/IndexController.java b/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/IndexController.java
index e0aa5ab..59a9474 100644
--- a/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/IndexController.java
+++ b/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/IndexController.java
@@ -1,18 +1,22 @@
 package com.atguigu.spzx.manger.controller;
 
 import com.atguigu.context.BaseContext;
+import com.atguigu.spzx.manger.service.SysMenuService;
 import com.atguigu.spzx.manger.service.SysUserService;
 import com.atguigu.spzx.manger.service.ValidateCodeService;
 import com.atguigu.spzx.model.dto.system.LoginDto;
 import com.atguigu.spzx.model.entity.system.SysUser;
 import com.atguigu.spzx.model.vo.result.Result;
 import com.atguigu.spzx.model.vo.system.LoginVo;
+import com.atguigu.spzx.model.vo.system.SysMenuVo;
 import com.atguigu.spzx.model.vo.system.ValidateCodeVo;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @Tag(name = "用户相关接口")
 @RestController
 @RequestMapping("/admin/system/index")
@@ -20,6 +24,8 @@ public class IndexController {
     @Autowired
     private SysUserService sysUserService;
     @Autowired
+    private SysMenuService sysMenuService;
+    @Autowired
     private ValidateCodeService validateCodeService;
 
     @Operation(summary = "生成验证码", description = "生成验证码信息")
@@ -49,4 +55,11 @@ public class IndexController {
         sysUserService.logout(token);
         return Result.success();
     }
+
+    @Operation(summary = "动态菜单", description = "动态菜单")
+    @GetMapping("menus")
+    public Result<List<SysMenuVo>> menus() {
+        List<SysMenuVo> sysMenuVoList = sysMenuService.findUserMenuList();
+        return Result.success(sysMenuVoList);
+    }
 }
\ No newline at end of file
diff --git a/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysUserController.java b/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysUserController.java
index 36a09c5..ea04746 100644
--- a/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysUserController.java
+++ b/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysUserController.java
@@ -28,21 +28,21 @@ public class SysUserController {
 
     @Operation(summary = "添加用户", description = "添加用户信息")
     @PostMapping(value = "saveSysUser")
-    public Result saveSysUser(@RequestBody SysUser sysUser) {
+    public Result<SysUser> saveSysUser(@RequestBody SysUser sysUser) {
         sysUserService.saveSysUser(sysUser);
         return Result.success();
     }
 
     @Operation(summary = "修改用户", description = "修改用户信息")
     @PutMapping("updateSysUser")
-    public Result updateSysUser(@RequestBody SysUser sysUser) {
+    public Result<SysUser> updateSysUser(@RequestBody SysUser sysUser) {
         sysUserService.updateSysUser(sysUser);
         return Result.success();
     }
 
     @Operation(summary = "根据id删除用户", description = "删除用户信息")
     @DeleteMapping(value = "deleteById/{userId}")
-    public Result deleteById(@PathVariable(value = "userId") Long userId) {
+    public Result<SysUser> deleteById(@PathVariable(value = "userId") Long userId) {
         sysUserService.deleteById(userId);
         return Result.success();
     }
diff --git a/spzx-manager/src/main/resources/mapper/SysUserMapper.xml b/spzx-manager/src/main/resources/mapper/SysUserMapper.xml
index bf7041d..5974c4e 100644
--- a/spzx-manager/src/main/resources/mapper/SysUserMapper.xml
+++ b/spzx-manager/src/main/resources/mapper/SysUserMapper.xml
@@ -16,6 +16,9 @@
     <update id="updateSysUser">
         update sys_user
         set
+        <if test="avatar != null and avatar != ''">
+            avatar = #{avatar},
+        </if>
         <if test="userName != null and userName != ''">
             username = #{userName},
         </if>