diff --git a/src/views/xm/core/xmProduct/XmProductTplMng.vue b/src/views/xm/core/xmProduct/XmProductTplMng.vue
index 3b07eb64..facc2d38 100644
--- a/src/views/xm/core/xmProduct/XmProductTplMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductTplMng.vue
@@ -3,14 +3,14 @@
 		<el-row v-if="showType!='simple'">
 			<el-checkbox v-model="filters.isMy" false-label="" true-label="1">我的模板</el-checkbox>
 			<el-input style="width:300px;" v-model="filters.key" placeholder="模板名字"></el-input>
-			<el-button @click="searchXmProjects" icon="el-icon-search"></el-button>
+			<el-button @click="searchXmProducts" icon="el-icon-search"></el-button>
 		</el-row>
 		<el-row v-if="showType=='simple'">
 			<el-row>
 				<el-checkbox v-model="filters.isMy" false-label="0" true-label="1">我的模板</el-checkbox>
 			</el-row>
 			<el-row>
-			<el-input style="width:80%;" v-model="filters.key" placeholder="模板名字"></el-input>&nbsp;&nbsp;<el-button @click="searchXmProjects" icon="el-icon-search"></el-button>
+			<el-input style="width:80%;" v-model="filters.key" placeholder="模板名字"></el-input>&nbsp;&nbsp;<el-button @click="searchXmProducts" icon="el-icon-search"></el-button>
 			</el-row>
 		</el-row>
 		<el-row  class="page-main page-height-70" >
diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue
index 61d9ebbd..9f800456 100644
--- a/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue
+++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue
@@ -183,6 +183,9 @@
 					 expandedKeys.push(this.selProject.id)
 				}else if(this.xmIteration){ 
 					 expandedKeys.push(this.xmIteration.id)
+				}else{
+					var groupsLvl1=this.xmProjectGroups.filter(i=>i.lvl<=1)
+					expandedKeys.push(...groupsLvl1)
 				}
 				return expandedKeys; 
 			},
@@ -356,9 +359,12 @@
 				if(this.filters.key){
 					params.key=this.filters.key
 				}
-
+				var func=getGroups
 				this.load.list = true;
-				getGroups(params).then((res) => {
+				if( !params.productId && !params.projectId && !params.iterationId){
+					func=listXmProjectGroup
+				}
+				func(params).then((res) => {
 					var tips=res.data.tips;
 					if(tips.isOk){ 
 						this.pageInfo.total = res.data.total;
diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue
index fa1afb2c..82e433b9 100644
--- a/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue
+++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue
@@ -12,7 +12,7 @@
  				</el-col> 
 		</el-row>  
 		<el-row class="page-main" v-loading="load.list" >
-			<el-row v-for="(item,index) in xmProjectGroupFormworkSels" :key="index">
+			<el-row v-for="(item,index) in xmProjectGroupFormworkSels" :key="index" class="padding">
 				<h3>
 					<div>{{item.groupName + "："}} 
 					</div>