From cd7767932dddeaf6d9c73a83d4a9b38f0341b77f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 28 一月 2022 12:46:17 +0800
Subject: [PATCH] bug修复

---
 src/main/java/com/yeshi/buwan/service/imp/UserService.java |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/service/imp/UserService.java b/src/main/java/com/yeshi/buwan/service/imp/UserService.java
index 2d8197c..26567bd 100644
--- a/src/main/java/com/yeshi/buwan/service/imp/UserService.java
+++ b/src/main/java/com/yeshi/buwan/service/imp/UserService.java
@@ -12,6 +12,7 @@
 import com.yeshi.buwan.exception.user.LoginUserException;
 import com.yeshi.buwan.exception.user.RegisterUserException;
 import com.yeshi.buwan.service.inter.LoginUserService;
+import com.yeshi.buwan.service.inter.system.SystemConfigService;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.springframework.cache.annotation.Cacheable;
@@ -47,11 +48,22 @@
     @Resource
     private LoginUserService loginUserService;
 
+    @Resource
+    private SystemConfigService systemConfigService;
+
 
     // 鐢ㄦ埛鎿嶄綔
     public List<UserInfo> getUserList(int system, int page) {
         return userDao.list("from UserInfo u where u.system.id=? order by u.createtime desc",
                 (page - 1) * Constant.pageCount, Constant.pageCount, new String[]{system + ""});
+    }
+
+    //璁剧疆鏄电О
+    public void setNickName(Long uid, String nickName) {
+        LoginUser update = new LoginUser();
+        update.setId(uid + "");
+        update.setName(nickName);
+        loginUserDao.updateSelective(update);
     }
 
     // 鑾峰彇鐢ㄦ埛鏁伴噺
@@ -85,7 +97,7 @@
     }
 
     public void updateLoginUserInfo(LoginUser lu) {
-        loginUserDao.update(lu);
+        loginUserDao.updateSelective(lu);
     }
 
     public String getUid(String device, String system, String imei, String mac, String lat, String lng) {
@@ -243,10 +255,11 @@
 
         if (loginUser != null) {
             loginUser.setLoginType(dto.getLoginType());
-            loginUserDao.update(loginUser);
+            loginUserDao.updateSelective(loginUser);
         }
 
         if (loginUserExtra != null) {
+            loginUserExtra.setUtdId(dto.getUtdId());
             loginUserExtraDao.updateSelective(loginUserExtra);
         }
 
@@ -343,7 +356,7 @@
 
                 loginUser = new LoginUser();
                 loginUser.setLoginType(LoginUser.LOGIN_TYPE_PHONE);
-                loginUser.setName(null);
+                loginUser.setName(dto.getNickName());
                 loginUser.setPhone(dto.getPhone());
 
                 loginUserExtra = new LoginUserExtra();
@@ -365,8 +378,10 @@
         loginUser.setId(uid + "");
 
         if (StringUtil.isNullOrEmpty(loginUser.getName())) {
+            //TODO 鏄电О鍓嶇紑
+//            systemConfigService.getConfigValueByKeyCache("");
             //璁剧疆榛樿鐢ㄦ埛鏄电О
-            String nickName = "鏃犲悕姘�";
+            String nickName = "ID_" + uid;
             LoginUser update = new LoginUser();
             update.setId(uid + "");
             update.setName(nickName);
@@ -406,7 +421,7 @@
             throw new Exception("璐︽埛宸茶娉ㄩ攢");
         }
         user.setState(LoginUser.STATE_UNREGISTER);
-        loginUserDao.update(user);
+        loginUserDao.updateSelective(user);
     }
 
     // 閭娉ㄥ唽

--
Gitblit v1.8.0