bug

src/pages/staff/list/RoleList.jsx

@@ -68,10 +68,8 @@ const [data, setData] = useState({ data: [] })
 
 
 function stop(ids, status) {
-  const title = status === 1 ? '停用后角色对应账号也会被自动停用，请谨慎操作' : '是否启用该角色';
-
   Modal.confirm({
-    title: title,
+    title: "删除后角色对应账号权限也会被自动停用，请谨慎操作",
     okText: '确认',
     cancelText: '取消',
     onOk () {
@@ -120,7 +118,7 @@ const columns = [
 
     render: (text, record) => <>
     <AuthButton name="admin.role.publish" noRight={null}>
-      <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={() => stop(record.roleId, record.status)}>{ record.status === 1 ? '停用' : '启用' }
+      <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={() => stop(record.roleId, record.status)}>{ record.status === 1 ? '删除' : '' }
       <Icon type="stop" className={styles.shoppingCart} style={{ fontSize: 14 }}/>
       </span>
       </AuthButton>

src/pages/staff/list/editStaff.jsx

@@ -72,6 +72,11 @@ const Edit = (props) => {
       userData.buildingIds = newBuildings
   }
 
+  if(userData.roleIds && roleData.length > 0){
+    const newRoleIds = userData.roleIds.filter(x => roleData.filter(it => it.roleId === x)[0])
+      userData.roleIds = newRoleIds
+  }
+
   useEffect(() => {
     getTagList();
     getRoleList();