diff --git a/api/app/lib/controllers/alarm/data.js b/api/app/lib/controllers/alarm/data.js index a2cd793..046b671 100644 --- a/api/app/lib/controllers/alarm/data.js +++ b/api/app/lib/controllers/alarm/data.js @@ -12,7 +12,7 @@ async function groupList (ctx) { for (let g of groupRes) { g.unit = await await clickHouse.anxinyun.query(` - SELECT * FROM t_alarm_group_unit WHERE group_id = ${g.id} + SELECT * FROM t_alarm_group_unit WHERE group_id = ${g.id} `).toPromise(); } diff --git a/web/client/src/sections/install/components/memberModal.jsx b/web/client/src/sections/install/components/memberModal.jsx index 72fb389..eeab3a4 100644 --- a/web/client/src/sections/install/components/memberModal.jsx +++ b/web/client/src/sections/install/components/memberModal.jsx @@ -1,6 +1,6 @@ import React, { useState, useRef, useEffect } from "react"; import { connect } from "react-redux"; -import { Modal, Form, CheckboxGroup, Checkbox } from "@douyinfe/semi-ui"; +import { Modal, Form, CheckboxGroup, Checkbox,Button } from "@douyinfe/semi-ui"; import { IconAlertCircle } from '@douyinfe/semi-icons'; @@ -42,6 +42,7 @@ function memberModal (props) { text: '拥有服务、工单、资料相关的权限' }, ]); //权限配置 + const [pomsList_, setPomsList_] = useState([]) //初始化 useEffect(() => { if (editObj.id) { @@ -54,6 +55,7 @@ function memberModal (props) { setDepartmentId(editObj.departments[0].id) setPeopleList(departmentList) } + setPomsList_(pomsList.filter(p=>p.pepProjectIsDelete != -1)) }, []); function handleOk () { @@ -212,15 +214,20 @@ function memberModal (props) { style={{ width: 417 }} filter showClear + outerBottomSlot={ +

+ +

+ } > { - pomsList.map((item, index) => { + pomsList_.map((item, index) => { return ( - item.pepProjectIsDelete !== 1 ? ( {item.pepProjectName || item.name} - ) : ('') ) }) }