From 77c7984fb636f81a87208aea2bcffc701f6419e8 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 23 十月 2024 16:01:26 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java b/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java
index de68916..e5d3c54 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java
@@ -108,10 +108,32 @@
 
     }
 
+    @Transactional
+    public Boolean updateUserName(Map<String,Object> object) {
+        boolean saveState = false;
+        int userId =0;
+        String userName = "";
+        if (object.get("userId") != null) {
+            userId = Integer.parseInt(object.get("userId").toString());
+        }
+        if (object.get("userName") != null) {
+            userName = object.get("userName").toString();
+        }
+
+        if (userMapper.updateUserNameById(userId,userName)){
+            saveState = true;
+        }
+        return saveState;
+
+    }
+
     /*----------------鏂扮増鏈櫥闄�*/
     public UserDTO doLogin(UserDTO userDTO) {
         User user = userMapper.selectOne(new QueryWrapper<User>().
-                eq("login_name", userDTO.getUserId()).eq("password", userDTO.getPass()));
+                eq("login_name", userDTO.getUserId())
+                .eq("password", userDTO.getPass())
+                .eq("state",1)
+        );
         if(user!=null){
             //妫�鏌ユ槸璁╂湁鐧诲綍锛屾湁鐧诲綍鐩存帴閫�鍑�
             StpUtil.logout(user.getId());

--
Gitblit v1.8.0