注册用户更换手机时应该同时变更用户名

ie-admin/src/main/java/com/ruoyi/web/controller/front/UserController.java

@@ -258,6 +258,7 @@ public class UserController extends BaseController {
     {
         LoginUser loginUser = getLoginUser();
         SysUser currentUser = loginUser.getUser();
+        boolean updateUserName = null != user.getPhonenumber() && !user.getPhonenumber().equals(currentUser.getPhonenumber()) && currentUser.getUserName().equals(currentUser.getPhonenumber());
         currentUser.setNickName(user.getNickName());
         currentUser.setEmail(user.getEmail());
         currentUser.setPhonenumber(user.getPhonenumber());
@@ -292,6 +293,9 @@ public class UserController extends BaseController {
             currentUser.setExamType(user.getExamType());
             currentUser.setEndYear(user.getEndYear());
         }
+        if (updateUserName) {
+            currentUser.setUserName(user.getPhonenumber());
+        }
         if (userService.updateUserProfile(currentUser) > 0)
         {
             // 更新缓存用户信息

ie-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java

@@ -66,6 +66,8 @@ public class SysProfileController extends BaseController
     {
         LoginUser loginUser = getLoginUser();
         SysUser currentUser = loginUser.getUser();
+        // 变更手机时，如果未绑定卡，这时用户名也要修改
+        boolean updateUserName = null != user.getPhonenumber() && !user.getPhonenumber().equals(currentUser.getPhonenumber()) && currentUser.getUserName().equals(currentUser.getPhonenumber());
         currentUser.setNickName(user.getNickName());
         currentUser.setEmail(user.getEmail());
         currentUser.setPhonenumber(user.getPhonenumber());
@@ -83,6 +85,9 @@ public class SysProfileController extends BaseController
         {
             return error("修改用户'" + loginUser.getUsername() + "'失败，邮箱账号已存在");
         }
+        if (updateUserName) {
+            currentUser.setUserName(user.getPhonenumber());
+        }
         if (userService.updateUserProfile(currentUser) > 0)
         {
             // 更新缓存用户信息

ie-admin/src/main/java/com/ruoyi/web/service/LearnTeacherService.java

@@ -379,7 +379,7 @@ public class LearnTeacherService {
         List<TreeNode> treeNodeList = Lists.newArrayList();
         Map<Long, TreeNode> teMap = Maps.newHashMap();
         for(LearnKnowledgeTree kt : ktList) {
-            TreeNode tn = new TreeNode(kt.getId(), kt.getName(), knowCountMap.get(kt.getId()));
+            TreeNode tn = new TreeNode(kt.getId(), kt.getName(), null != knowCountMap ? knowCountMap.get(kt.getId()) : null);
             teMap.put(kt.getId(), tn);
         }
         for(LearnKnowledgeTree kt : ktList) {