From 40e9bc720ae7887526413085240899cc31f6f59c Mon Sep 17 00:00:00 2001
From: suxiaoxin <hellosean1025@163.com>
Date: Fri, 29 Sep 2017 17:30:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=86=E7=BB=84=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/containers/Group/GroupList/GroupList.js | 4 ++--
 client/plugin-module.js                        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/containers/Group/GroupList/GroupList.js b/client/containers/Group/GroupList/GroupList.js
index b4287510..0aa4098f 100755
--- a/client/containers/Group/GroupList/GroupList.js
+++ b/client/containers/Group/GroupList/GroupList.js
@@ -268,13 +268,13 @@ export default class GroupList extends Component {
         this.props.curUserRole === 'admin' ? (addmark) : ''
       }
     </Menu>;
-    menu = currGroup.role === 'owner'  ? <a className="editSet"><Icon type="setting" onClick={() => this.showModal(TYPE_EDIT)} /></a> : <Dropdown overlay={menu}>
+    menu = (currGroup.role === 'owner' && this.props.curUserRole !== 'admin')  ? <a className="editSet"><Icon type="setting" onClick={() => this.showModal(TYPE_EDIT)} /></a> : <Dropdown overlay={menu}>
       <a className="ant-dropdown-link" href="#">
         <Icon type="setting" />
       </a>
     </Dropdown>;
 
-    if(this.props.currGroup.type!=='private' && currGroup.role === 'owner'){
+    if(this.props.currGroup.type==='private' && currGroup.role === 'owner' && this.props.curUserRole !== 'admin'){
       menu = null;
     }
 
diff --git a/client/plugin-module.js b/client/plugin-module.js
index 7c6d6c73..c3cbdea7 100644
--- a/client/plugin-module.js
+++ b/client/plugin-module.js
@@ -1 +1 @@
-module.exports = {}
\ No newline at end of file
+module.exports = {qsso : require('plugins/yapi-plugin-qsso/client.js')}
\ No newline at end of file