登录bug修复

app/controller/ledger_audit_controller.js

@@ -96,7 +96,7 @@ module.exports = app => {
                 renderData.ledgerSpreadSetting = JSON.stringify(ledgerSpread);
                 renderData.posSpreadSetting = JSON.stringify(posSpread);
                 renderData.readOnly = true;
-                renderData.jsFiles = this.app.jsFiles.common.concat(this.app.jsFiles.ledger.audit),
+                renderData.jsFiles = this.app.jsFiles.common.concat(this.app.jsFiles.ledger.audit);
                 await this.layout('ledger/audit.ejs', renderData, 'ledger/audit_modal.ejs');
             } catch (err) {
                 this.log(err);

app/service/project_account.js

@@ -145,16 +145,16 @@ module.exports = app => {
                     cooperation = accountData.cooperation;
 
                     // 判断密码
-                    if (accountData.is_admin === 1) {
-                        // 管理员则用sso通道判断
-                        const sso = new SSO(this.ctx);
-                        result = await sso.loginValid(data.account, data.project_password.toString());
-                    } else {
-                        // 加密密码
-                        const encryptPassword = crypto.createHmac('sha1', data.account).update(data.project_password)
-                            .digest().toString('base64');
-                        result = encryptPassword === accountData.password;
-                    }
+                    // if (accountData.is_admin === 1) {
+                    //     // 管理员则用sso通道判断
+                    //     const sso = new SSO(this.ctx);
+                    //     result = await sso.loginValid(data.account, data.project_password.toString());
+                    // } else {
+                    // 加密密码
+                    const encryptPassword = crypto.createHmac('sha1', data.account).update(data.project_password)
+                        .digest().toString('base64');
+                    result = encryptPassword === accountData.password;
+                    // }
                 } else {
                     // sso登录（演示版）
                     const sso = new SSO(this.ctx);

app/view/setting/user.ejs

@@ -72,7 +72,7 @@
                             <td><%= account.company %></td>
                             <td><%= account.role %></td>
                             <td><% if (account.cooperation === 1) { %>启用<% } %></td>
-                            <td><% if (account.permission !== '' && JSON.parse(account.permission).tender !== undefined) { %>
+                            <td><% if (account.permission !== '' && account.permission !== null && JSON.parse(account.permission).tender !== undefined) { %>
                                 <% const tenderPermission = JSON.parse(account.permission).tender; %>
                                     <% for (const tc in permission.tender.children) { %>
                                         <% if (tenderPermission.indexOf(permission.tender.children[tc].value.toString()) !== -1) { %>