Bladeren bron

Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

laiguoran 3 jaren geleden
bovenliggende
commit
ef22a4a3ee
1 gewijzigde bestanden met toevoegingen van 5 en 5 verwijderingen
  1. 5 5
      app/controller/login_controller.js

+ 5 - 5
app/controller/login_controller.js

@@ -437,15 +437,15 @@ module.exports = app => {
                 msg: '',
             };
             try {
-              const projectData = await ctx.service.project.getProjectByCode(ctx.session.sessionProject.code)
+              const code = ctx.session.sessionProject.code
               const accountData = await ctx.service.projectAccount.getDataById(ctx.session.sessionUser.accountId)
-              if (!projectData || !accountData) {
+              if (!code || !accountData) {
                 throw new Error('参数错误')
               }
-                const result = await ctx.service.project.verifyManagementProject(ctx.helper.createJWT({ code: projectData.code }));
-                const token = ctx.helper.createJWT({ code: projectData.code, account: accountData.account })
+                const result = await ctx.service.project.verifyManagementProject(ctx.helper.createJWT({ code }));
+                const token = ctx.helper.createJWT({ code, account: accountData.account })
                 const redirect = `${app.config.managementPath}/auth?token=${token}`
-                response.data = { ...result, is_admin: accountData.account === projectData.user_account, redirect, env: app.config.env};
+                response.data = { ...result, is_admin: accountData.is_admin, redirect, env: app.config.env};
             } catch (error) {
                 response.code = -1;
                 response.msg = error.toString();