From b1b5cf4b00ddc12f624f299174a6366d2cdb2617 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 26 十二月 2025 15:20:31 +0800
Subject: [PATCH] 提交相关代码

---
 north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserController.java |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserController.java b/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserController.java
index 2d93c73..5269f53 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserController.java
@@ -30,7 +30,6 @@
 
     @GetMapping
     public List<User> getUser(){
-        System.out.println(cacheUtil.getCacheData("admin"));
         return userMapper.findAll();
     }
     @ApiOperation("鐧诲綍")
@@ -40,7 +39,7 @@
         userService.deleteCache(userDTO.getUserId());
         UserDTO getUserDTO=userService.login(userDTO);
         if(getUserDTO!=null){
-            return Result.seccess(userDTO);
+            return Result.success(userDTO);
         }else{
             throw new ServiceException(Constants.Code_600,"鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒");
         }
@@ -52,7 +51,7 @@
         if(getUser == null){
             throw new ServiceException(Constants.Code_500,"娉ㄥ唽澶辫触");
         }else {
-            return Result.seccess(getUser);
+            return Result.success(getUser);
         }
 
         //return
@@ -60,6 +59,19 @@
     @ApiOperation("淇敼瀵嗙爜")
     @PostMapping("/updatePassWord")
     public Result updatePassWord(@RequestBody Map<String,Object> object){
-        return Result.seccess( userService.updatePassWord(object));
+        return Result.success( userService.updatePassWord(object));
     }
+
+    @ApiOperation("淇敼鐢ㄦ埛鍚�")
+    @PostMapping("/updateUserName")
+    public Result updateUserName(@RequestBody Map<String,Object> object){
+        return Result.success( userService.updateUserName(object));
+    }
+
+    @ApiOperation("鐢ㄦ埛鐧诲綍璁板綍")
+    @PostMapping("/getUserLog")
+    public Result getUserLog(){
+        return Result.success( userService.getUserLog());
+    }
+
 }

--
Gitblit v1.8.0