Merge branch '1.0.x' into dev

# Conflicts:
#	continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java

continew-admin-system/src/main/java/top/charles7c/cnadmin/system/mapper/UserMapper.java

@@ -54,4 +54,14 @@ public interface UserMapper extends BaseMapper<UserDO> {
      */
     @Select("SELECT * FROM `sys_user` WHERE `username` = #{username}")
     UserDO selectByUsername(@Param("username") String username);
+
+    /**
+     * 根据 ID 查询昵称
+     *
+     * @param id
+     *            ID
+     * @return 昵称
+     */
+    @Select("SELECT `nickname` FROM `sys_user` WHERE `id` = #{id}")
+    String selectNicknameById(@Param("id") Long id);
 }

continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java

@@ -248,7 +248,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserVO,
 
     @Override
     public String getNicknameById(Long id) {
-        return super.getById(id).getNickname();
+        return baseMapper.selectNicknameById(id);
     }
 
     /**