Merge branch 'master' of https://gitea.anxinyun.cn/free-sun/Inspection

web/client/src/sections/organization/containers/authority.js

@@ -13,7 +13,7 @@ const Authority = (props) => {
    const [userSelected, setUserSelected] = useState()
    const [resCode, setResCode] = useState({})
    const [useName, setUseName] = useState()// 选中名字
-    const [userType,setUserType]=useState()
+   const [userType, setUserType] = useState()
    console.log(resource)
    useEffect(() => {
       dispatch(getResource())
@@ -78,7 +78,7 @@ const Authority = (props) => {
                </Card>
             </Col>
             <Col span={4} style={{ height: '100%', }}>
-                    <Card title={`[${depSelected}] 用户列表`} bordered={false} bodyStyle={{ padding: 8, paddingTop: 24 }}>
+               <Card title={(depSelected ? `[${depSelected}]` : "") + '用户列表'} bordered={false} bodyStyle={{ padding: 8, paddingTop: 24 }}>
                   {
                      depUser.length ?
                         <Tree
@@ -118,7 +118,7 @@ const Authority = (props) => {
                      <Row type="flex" justify="center" style={{ marginBottom: 16, marginTop: 16, textAlign: 'center' }}>
                         <Col span="24">
                            <Button
-                                        disabled={userSelected === "SuperAdmin"||userType===4}
+                              disabled={userSelected === "SuperAdmin" || userType === 4}
                               onClick={handleSave}
                               style={{ width: '60%' }}
                               type='primary'>保存修改</Button>
@@ -134,7 +134,7 @@ const Authority = (props) => {
    )
 }
 
-function mapStateToProps(state) {
+function mapStateToProps (state) {
    const { userResource, resource, depMessage, depUser, global } = state;
    return {
       clientHeight: global.clientHeight,