From 4a1890ba40a543d602e31f94d3f386d9ed15e033 Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Mon, 27 Mar 2023 10:54:42 +0800
Subject: [PATCH] update

---
 src/service/die.service.js | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/service/die.service.js b/src/service/die.service.js
index c1bc835..7c9dc1a 100644
--- a/src/service/die.service.js
+++ b/src/service/die.service.js
@@ -26,13 +26,18 @@ class DieService {
 
   // 需要根据鸡舍编号和批次号进行模糊查询
   async getAllDieInfo(house_id, coop_ids = [], batch_number = "") {
-    const res = await Die.findAll({
-      where: {
-        house_id,
+    let whereObj = {
+      house_id,
+    };
+    coop_ids &&
+      coop_ids.length > 0 &&
+      Object.assign(whereObj, {
         coop_id: {
           [Op.in]: coop_ids,
         },
-      },
+      });
+    const res = await Die.findAll({
+      where: whereObj,
     });
     const arr = res?.map((item) => item.dataValues);
     // 对arr中的数据进行处理
@@ -60,8 +65,8 @@ class DieService {
         item.house_id
       );
       const coopInfo = await getCoopById(item.coop_id);
-      item.batch_number = chickenInfo.batch_number;
-      item.coop_name = coopInfo.coop_name;
+      item.batch_number = chickenInfo?.batch_number;
+      item.coop_name = coopInfo?.coop_name;
       return item;
     });
     const hasBatch = await Promise.all(p);
@@ -70,7 +75,11 @@ class DieService {
       if (batch_number == "") {
         return true;
       } else {
-        return item.batch_number.indexOf(batch_number) != -1;
+        if (item.batch_number) {
+          return item.batch_number?.indexOf(batch_number) != -1;
+        } else {
+          return false;
+        }
       }
     });
     return result;