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

yyb

22 小时以前 5470429a79313630a7ddef601de1d89e7dada754

 src/store/modules/user.js

@@ -25,8 +25,13 @@
        const uuid = userInfo.uuid

        return new Promise((resolve, reject) => {

          login(username, password, code, uuid).then(res => {

            setToken(res.token)

            this.token = res.token

            const token = res?.token || res?.data?.token
            if (!token) {
              reject(new Error('未获取到登录令牌'))
              return
            }
            setToken(token)
            this.token = token
            resolve()

          }).catch(error => {

            reject(error)

@@ -47,25 +52,26 @@
      getInfo() {

        return new Promise((resolve, reject) => {

          getInfo().then(res => {

            const user = res.user

            const data = res?.data ?? res
            const user = data.user || {}
            let avatar = user.avatar || ""

            avatar = import.meta.env.VITE_APP_BASE_API + '/profile/' + avatar

            if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组

              this.roles = res.roles

              this.permissions = res.permissions

            if (data.roles && data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
              this.roles = data.roles
              this.permissions = data.permissions
            } else {

              this.roles = ['ROLE_DEFAULT']

            }

            this.id = user.userId

            this.name = user.userName

            this.id = user.userId || ''
            this.name = user.userName || ''
            this.avatar = avatar

            this.currentFactoryName = user.currentFactoryName
            this.nickName = user.nickName
            this.roleName = user.roles[0].roleName
            this.currentDeptId = user.tenantId
            this.currentFactoryName = user.currentFactoryName || ''
            this.nickName = user.nickName || ''
            this.roleName = Array.isArray(user.roles) && user.roles.length > 0 ? (user.roles[0].roleName || '') : ''
            this.currentDeptId = user.tenantId || ''
            this.currentLoginTime = this.getCurrentTime()
            this.aiEnabled = Number(res.aiEnabled) === 1 ? 1 : 0
            resolve(res)
            this.aiEnabled = Number(data.aiEnabled) === 1 ? 1 : 0
            resolve(data)
          }).catch(error => {
            reject(error)
          })
@@ -104,8 +110,13 @@
        const password = userInfo.password

        return new Promise((resolve, reject) => {

          loginCheckFactory(username, password).then(res => {

            setToken(res.token)

            this.token = res.token

            const token = res?.token || res?.data?.token
            if (!token) {
              reject(new Error('未获取到登录令牌'))
              return
            }
            setToken(token)
            this.token = token
            resolve()

          }).catch(error => {

            reject(error)

@@ -116,10 +127,15 @@
        return new Promise((resolve, reject) => {

          tideLogin(code)

              .then((res) => {

                setToken(res.token);

                this.token = res.token

                const token = res?.token || res?.data?.token
                if (!token) {
                  reject(new Error('未获取到登录令牌'))
                  return
                }
                setToken(token);
                this.token = token
                Vue.prototype.uploadHeader = {

                  Authorization: "Bearer " + res.token,

                  Authorization: "Bearer " + token,
                };

                resolve();

              })