Merge remote-tracking branch 'origin/dev' into dev

src/main/java/cn/chnmuseum/party/common/log/SystemOperationLogService.java

@@ -66,8 +66,12 @@ public class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog>
         if (StringUtils.isBlank(header)) {
             throw new AuthenticationException("token失效,请重新登录");
         }
-        String username = JwtTokenUtil.getUsername(header);
-        return userService.selectByUsername(username);
+        /**
+         * 决绝修改用户名会报错的问题
+         */
+//        String username = JwtTokenUtil.getUsername(header);
+        String userId = JwtTokenUtil.getEmployeeId(header);
+        return userService.selectById(userId);
     }
 
     /**

src/main/java/cn/chnmuseum/party/web/controller/base/BaseController.java

@@ -263,8 +263,10 @@ public class BaseController implements Serializable {
      * </p>
      */
     protected TUser getcurUser() {
-        String userName = getUserName();
-        TUser user = userService.selectByUsername(userName);
+//        String userName = getUserName();
+        String userId = getUserId();
+//        TUser user = userService.selectByUsername(userName);
+        TUser user = userService.selectById(userId);
         return user;
     }