From c561472a3875c7f2e2ba2b59dc8c968c296aa530 Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Thu, 1 Jun 2023 15:39:57 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=8D=95=E4=B8=80=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E8=8E=B7=E5=8F=96=E9=A1=B9=E7=9B=AE=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/app/lib/controllers/workOrder/index.js   | 8 ++++----
 web/client/src/components/workflow/index.jsx | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

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"