From e6983c2fbf32671c05ea2bf18bc04774dcfca19c Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Thu, 1 Jun 2023 12:15:45 +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 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/api/app/lib/controllers/workOrder/index.js b/api/app/lib/controllers/workOrder/index.js
index 16c65f4..af14c0c 100644
--- a/api/app/lib/controllers/workOrder/index.js
+++ b/api/app/lib/controllers/workOrder/index.js
@@ -37,7 +37,8 @@ async function getEnabledWorkflowProcess (ctx) {
 async function basicDataAllProject (ctx) {
    try {
       const { models } = ctx.fs.dc;
-
+      const { userId, pepUserId, userInfo, pepUserInfo } = ctx.fs.api
+      console.log('userId', userId);
       const proRes = await models.ProjectCorrelation.findAndCountAll({
          where: {
             del: false,
@@ -62,8 +63,9 @@ async function basicDataAllProject (ctx) {
             FROM t_pim_project
                WHERE id IN (${[...pepProjectIds].join(',')}, -1)
             `
-         ).toPromise() :
+         ).toPromise() || [] :
          []
+      console.log('pepProjectRes', pepProjectRes);
       const list = proRes.map(p => {
          const corPro = pepProjectRes.find(pp => pp.id == p.pepProjectId) || {}
          return {