From b19b4e534b1a9ddd19c37a3441d0a01c35e0f33d Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Sat, 24 Sep 2022 17:20:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=91=8A=E8=AD=A6=20groupUni?=
 =?UTF-8?q?tId=20=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/app/lib/controllers/alarm/data.js | 2 +-
 web/package.json                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/app/lib/controllers/alarm/data.js b/api/app/lib/controllers/alarm/data.js
index 87e142b..e390a1a 100644
--- a/api/app/lib/controllers/alarm/data.js
+++ b/api/app/lib/controllers/alarm/data.js
@@ -49,7 +49,7 @@ async function list (ctx) {
             whereOption.push(`alarms.AlarmGroup IN (${groupId})`)
          }
          if (groupUnitId) {
-            whereOption.push(`alarms.AlarmGroupUnit=${groupId}`)
+            whereOption.push(`alarms.AlarmGroupUnit=${groupUnitId}`)
          }
          if (sustainTimeStart && sustainTimeEnd) {
             let momentStart = moment(sustainTimeStart).format()
diff --git a/web/package.json b/web/package.json
index 0ab223a..b85cebe 100644
--- a/web/package.json
+++ b/web/package.json
@@ -47,7 +47,7 @@
       "vite": "^2.9.5"
    },
    "dependencies": {
-      "@douyinfe/semi-ui": "2.8.0",
+      "@douyinfe/semi-ui": "^2.20.0",
       "@douyinfe/semi-webpack-plugin": "^2.13.0",
       "@micro-zoe/micro-app": "^1.0.0-alpha.1",
       "@peace/utils": "^0.0.64",