替换所有人员单位筛选

app/controller/advance_controller.js

@@ -91,9 +91,10 @@ module.exports = app => {
                     columns: ['id', 'name', 'company', 'role', 'enable', 'is_admin', 'account_group', 'mobile'],
                 });
                 data.accountList = accountList;
-                data.accountGroup = accountGroup.map((item, idx) => {
-                    const groupList = accountList.filter(item => item.account_group === idx);
-                    return { groupName: item, groupList };
+                const unitList = await ctx.service.constructionUnit.getAllDataByCondition({ where: { pid: ctx.session.sessionProject.id } });
+                data.accountGroup = unitList.map(item => {
+                    const groupList = accountList.filter(item1 => item1.company === item.name);
+                    return { groupName: item.name, groupList };
                 });
                 data.auditorList = await ctx.service.advanceAudit.getAuditors(ctx.advance.id, ctx.advance.times);
             }

app/controller/change_controller.js

@@ -358,9 +358,10 @@ module.exports = app => {
                         columns: ['id', 'name', 'company', 'role', 'enable', 'is_admin', 'account_group'],
                     });
                     renderData.accountList = accountList;
-                    renderData.accountGroup = accountGroup.map((item, idx) => {
-                        const groupList = accountList.filter(item => item.account_group === idx);
-                        return { groupName: item, groupList };
+                    const unitList = await ctx.service.constructionUnit.getAllDataByCondition({ where: { pid: ctx.session.sessionProject.id } });
+                    renderData.accountGroup = unitList.map(item => {
+                        const groupList = accountList.filter(item1 => item1.company === item.name);
+                        return { groupName: item.name, groupList };
                     });
                     // 重新上报获取审批流程
                     if (auditStatus === 2 || auditStatus === 9) {
@@ -639,9 +640,10 @@ module.exports = app => {
                         columns: ['id', 'name', 'company', 'role', 'enable', 'is_admin', 'account_group'],
                     });
                     renderData.accountList = accountList;
-                    renderData.accountGroup = accountGroup.map((item, idx) => {
-                        const groupList = accountList.filter(item => item.account_group === idx);
-                        return { groupName: item, groupList };
+                    const unitList = await ctx.service.constructionUnit.getAllDataByCondition({ where: { pid: ctx.session.sessionProject.id } });
+                    renderData.accountGroup = unitList.map(item => {
+                        const groupList = accountList.filter(item1 => item1.company === item.name);
+                        return { groupName: item.name, groupList };
                     });
                     // 重新上报获取审批流程
                     if (auditStatus === 2 || auditStatus === 9) {
@@ -2094,9 +2096,10 @@ module.exports = app => {
                     columns: ['id', 'name', 'company', 'role', 'enable', 'is_admin', 'account_group', 'mobile'],
                 });
                 renderData.accountList = accountList;
-                renderData.accountGroup = accountGroup.map((item, idx) => {
-                    const groupList = accountList.filter(item => item.account_group === idx);
-                    return { groupName: item, groupList };
+                const unitList = await ctx.service.constructionUnit.getAllDataByCondition({ where: { pid: ctx.session.sessionProject.id } });
+                renderData.accountGroup = unitList.map(item => {
+                    const groupList = accountList.filter(item1 => item1.company === item.name);
+                    return { groupName: item.name, groupList };
                 });
                 // }
                 await this.layout('change/project_information.ejs', renderData, 'change/project_information_modal.ejs');
@@ -2694,9 +2697,10 @@ module.exports = app => {
                         columns: ['id', 'name', 'company', 'role', 'enable', 'is_admin', 'account_group', 'mobile'],
                     });
                     renderData.accountList = accountList;
-                    renderData.accountGroup = accountGroup.map((item, idx) => {
-                        const groupList = accountList.filter(item => item.account_group === idx);
-                        return { groupName: item, groupList };
+                    const unitList = await ctx.service.constructionUnit.getAllDataByCondition({ where: { pid: ctx.session.sessionProject.id } });
+                    renderData.accountGroup = unitList.map(item => {
+                        const groupList = accountList.filter(item1 => item1.company === item.name);
+                        return { groupName: item.name, groupList };
                     });
                 }
                 await this.layout('change/apply_information.ejs', renderData, 'change/apply_information_modal.ejs');
@@ -3315,9 +3319,10 @@ module.exports = app => {
                         columns: ['id', 'name', 'company', 'role', 'enable', 'is_admin', 'account_group', 'mobile'],
                     });
                     renderData.accountList = accountList;
-                    renderData.accountGroup = accountGroup.map((item, idx) => {
-                        const groupList = accountList.filter(item => item.account_group === idx);
-                        return { groupName: item, groupList };
+                    const unitList = await ctx.service.constructionUnit.getAllDataByCondition({ where: { pid: ctx.session.sessionProject.id } });
+                    renderData.accountGroup = unitList.map(item => {
+                        const groupList = accountList.filter(item1 => item1.company === item.name);
+                        return { groupName: item.name, groupList };
                     });
                 }
                 await this.layout('change/plan_information.ejs', renderData, 'change/plan_information_modal.ejs');

app/controller/ledger_controller.js

@@ -163,9 +163,10 @@ module.exports = app => {
                         columns: ['id', 'name', 'company', 'role', 'enable', 'is_admin', 'account_group', 'mobile'],
                     });
                     renderData.accountList = accountList;
-                    renderData.accountGroup = accountGroup.map((item, idx) => {
-                        const groupList = accountList.filter(item => item.account_group === idx);
-                        return { groupName: item, groupList };
+                    const unitList = await ctx.service.constructionUnit.getAllDataByCondition({ where: { pid: ctx.session.sessionProject.id } });
+                    renderData.accountGroup = unitList.map(item => {
+                        const groupList = accountList.filter(item1 => item1.company === item.name);
+                        return { groupName: item.name, groupList };
                     });
                     renderData.auditorList = await ctx.service.ledgerAudit.getAuditors(tender.id, tender.data.ledger_times);
                 }

app/controller/material_controller.js

@@ -244,9 +244,10 @@ module.exports = app => {
                     columns: ['id', 'name', 'company', 'role', 'enable', 'is_admin', 'account_group', 'mobile'],
                 });
                 data.accountList = accountList;
-                data.accountGroup = accountGroup.map((item, idx) => {
-                    const groupList = accountList.filter(item => item.account_group === idx);
-                    return { groupName: item, groupList };
+                const unitList = await ctx.service.constructionUnit.getAllDataByCondition({ where: { pid: ctx.session.sessionProject.id } });
+                data.accountGroup = unitList.map(item => {
+                    const groupList = accountList.filter(item1 => item1.company === item.name);
+                    return { groupName: item.name, groupList };
                 });
             }
             data.tenderMenu.back.children[0].url = '/tender/' + ctx.tender.id + '/measure/material';

app/controller/revise_controller.js

@@ -355,9 +355,10 @@ module.exports = app => {
                 where: { project_id: ctx.session.sessionProject.id, enable: 1 },
                 columns: ['id', 'name', 'company', 'role', 'enable', 'is_admin', 'account_group', 'mobile'],
             });
-            renderData.accountGroup = accountGroup.map((item, idx) => {
-                const groupList = renderData.accountList.filter(item => item.account_group === idx);
-                return { groupName: item, groupList };
+            const unitList = await ctx.service.constructionUnit.getAllDataByCondition({ where: { pid: ctx.session.sessionProject.id } });
+            renderData.accountGroup = unitList.map(item => {
+                const groupList = renderData.accountList.filter(item1 => item1.company === item.name);
+                return { groupName: item.name, groupList };
             });
             renderData.auditorList = await ctx.service.reviseAudit.getAuditors(revise.id, revise.times);
             renderData.curAuditor = await ctx.service.reviseAudit.getCurAuditor(revise.id, revise.times);

app/controller/stage_controller.js

@@ -72,9 +72,10 @@ module.exports = app => {
                     columns: ['id', 'name', 'company', 'role', 'enable', 'is_admin', 'account_group', 'mobile'],
                 });
                 data.accountList = accountList;
-                data.accountGroup = accountGroup.map((item, idx) => {
-                    const groupList = accountList.filter(item => item.account_group === idx);
-                    return { groupName: item, groupList };
+                const unitList = await ctx.service.constructionUnit.getAllDataByCondition({ where: { pid: ctx.session.sessionProject.id } });
+                data.accountGroup = unitList.map(item => {
+                    const groupList = accountList.filter(item1 => item1.company === item.name);
+                    return { groupName: item.name, groupList };
                 });
             }
             data.tenderMenu.back.children[0].url = '/tender/' + ctx.tender.id + '/measure/stage';

app/controller/sub_proj_controller.js

@@ -32,9 +32,10 @@ module.exports = app => {
                     columns: ['id', 'name', 'company', 'role', 'enable', 'is_admin', 'account_group', 'mobile'],
                 });
                 renderData.accountList = accountList;
-                renderData.accountGroup = accountGroup.map((item, idx) => {
-                    const groupList = accountList.filter(item => item.account_group === idx);
-                    return { groupName: item, groupList };
+                const unitList = await ctx.service.constructionUnit.getAllDataByCondition({ where: { pid: ctx.session.sessionProject.id } });
+                renderData.accountGroup = unitList.map(item => {
+                    const groupList = accountList.filter(item1 => item1.company === item.name);
+                    return { groupName: item.name, groupList };
                 });
                 renderData.permissionConst = ctx.service.subProjPermission.PermissionConst;
                 renderData.categoryData = await this.ctx.service.category.getAllCategory(this.ctx.session.sessionProject.id);
@@ -177,4 +178,4 @@ module.exports = app => {
     }
 
     return SubProjController;
-};
+};

app/controller/tender_controller.js

@@ -692,9 +692,10 @@ module.exports = app => {
                         where: { project_id: ctx.session.sessionProject.id, enable: 1 },
                         columns: ['id', 'name', 'company', 'role', 'enable', 'is_admin', 'account_group', 'mobile'],
                     });
-                    const accountGroupList = accountGroup.map((item, idx) => {
-                        const groupList = accountList.filter(item => item.account_group === idx);
-                        return { groupName: item, groupList };
+                    const unitList = await ctx.service.constructionUnit.getAllDataByCondition({ where: { pid: ctx.session.sessionProject.id } });
+                    const accountGroupList = unitList.map(item => {
+                        const groupList = accountList.filter(item1 => item1.company === item.name);
+                        return { groupName: item.name, groupList };
                     });
                     renderData.accountList = accountList;
                     renderData.accountGroup = accountGroupList;
@@ -1027,9 +1028,10 @@ module.exports = app => {
                 where: { project_id: ctx.session.sessionProject.id, enable: 1 },
                 columns: ['id', 'name', 'company', 'role', 'enable', 'is_admin', 'account_group', 'mobile'],
             });
-            const accountGroupList = accountGroup.map((item, idx) => {
-                const groupList = accountList.filter(item => item.account_group === idx);
-                return { groupName: item, groupList };
+            const unitList = await ctx.service.constructionUnit.getAllDataByCondition({ where: { pid: ctx.session.sessionProject.id } });
+            const accountGroupList = unitList.map(item => {
+                const groupList = accountList.filter(item1 => item1.company === item.name);
+                return { groupName: item.name, groupList };
             });
             // 获取固定审批流 or 固定终审
             for (const sp of shenpiConst.sp_lc) {