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",