diff --git a/api/app/lib/controllers/workOrder/index.js b/api/app/lib/controllers/workOrder/index.js index 62472cc..a78fda0 100644 --- a/api/app/lib/controllers/workOrder/index.js +++ b/api/app/lib/controllers/workOrder/index.js @@ -38,8 +38,8 @@ async function basicDataAllProject (ctx) { try { const { models } = ctx.fs.dc; const { clickHouse } = ctx.app.fs - - const proRes = await models.ProjectCorrelation.findAndCountAll({ + + const proRes = await models.ProjectCorrelation.findAll({ where: { del: false, }, @@ -65,8 +65,8 @@ async function basicDataAllProject (ctx) { ` ).toPromise() || [] : [] - console.log('pepProjectRes', pepProjectRes); - const list = proRes.map(p => { + + const list = proRes.map(p => { const corPro = pepProjectRes.find(pp => pp.id == p.pepProjectId) || {} return { value: p.id, diff --git a/web/client/src/components/workflow/index.jsx b/web/client/src/components/workflow/index.jsx index 603ef15..12ad985 100644 --- a/web/client/src/components/workflow/index.jsx +++ b/web/client/src/components/workflow/index.jsx @@ -150,7 +150,6 @@ const WorkFlowModal = (props) => { allowTransparency="true" ref={iframeRef} src={`${webEmis}/process/${processId}/apply?token=${user.token}`} - // src={`${webEmis}/process/${processId}/apply?token=${user.token}`} width={'100%'} style={{ height: '100vh' }} frameBorder="0"