From e19f7bd0aca6a89554ff6ee8c1a8f38cd9305dec Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Sat, 24 Sep 2022 12:49:53 +0800 Subject: [PATCH] "@douyinfe/semi-ui": "2.8.0" --- api/app/lib/controllers/alarm/data.js | 5 +---- web/client/index.ejs | 1 - web/package.json | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/api/app/lib/controllers/alarm/data.js b/api/app/lib/controllers/alarm/data.js index 09044c7..6f53679 100644 --- a/api/app/lib/controllers/alarm/data.js +++ b/api/app/lib/controllers/alarm/data.js @@ -37,10 +37,7 @@ async function list (ctx) { const { pepProjectId, keyword, groupId, groupUnitId, sustainTimeStart, sustainTimeEnd, limit, page } = ctx.query const isSuper = judgeSuper(ctx) - let anxinStrucIds = null - if (!isSuper || pepProjectId) { - anxinStrucIds = await anxinStrucIdRange({ ctx, pepProjectId }) - } + let anxinStrucIds = await anxinStrucIdRange({ ctx, pepProjectId }) let whereOption = [] if (anxinStrucIds) { whereOption.push(`alarms.StructureId IN (${anxinStrucIds.join(",")})`) diff --git a/web/client/index.ejs b/web/client/index.ejs index 6d2bdfc..a2612bd 100644 --- a/web/client/index.ejs +++ b/web/client/index.ejs @@ -11,7 +11,6 @@ - diff --git a/web/package.json b/web/package.json index 874d87f..0ab223a 100644 --- a/web/package.json +++ b/web/package.json @@ -48,7 +48,7 @@ }, "dependencies": { "@douyinfe/semi-ui": "2.8.0", - "@douyinfe/semi-webpack-plugin": "2.13.0", + "@douyinfe/semi-webpack-plugin": "^2.13.0", "@micro-zoe/micro-app": "^1.0.0-alpha.1", "@peace/utils": "^0.0.64", "@semi-bot/semi-theme-fscamera": "^1.0.0",