diff --git a/src/views/xm/core/components/XmIterationSelect.vue b/src/views/xm/core/components/XmIterationSelect.vue
index 4a37b400..e07cec69 100644
--- a/src/views/xm/core/components/XmIterationSelect.vue
+++ b/src/views/xm/core/components/XmIterationSelect.vue
@@ -284,7 +284,7 @@
 							key='xm-iteration-select-list-prd-'+this.productId 
 							sessionStorage.setItem(key,JSON.stringify(this.xmIterations))
 						}else if(this.linkProjectId){
-							key='xm-iteration-select-list-prj'+this.linkProjectId  
+							key='xm-iteration-select-list-prj-'+this.linkProjectId  
 							sessionStorage.setItem(key,JSON.stringify(this.xmIterations))
 						}
  
@@ -339,7 +339,7 @@
 				if(this.productId){
 					key='xm-iteration-select-list-prd-'+this.productId 
 				}else if(this.linkProjectId){
-					key='xm-iteration-select-list-prj'+this.linkProjectId 
+					key='xm-iteration-select-list-prj-'+this.linkProjectId 
 				}
 				
 				if(key){
diff --git a/src/views/xm/core/components/XmProductSelect.vue b/src/views/xm/core/components/XmProductSelect.vue
index bb4fb406..abb9d50f 100644
--- a/src/views/xm/core/components/XmProductSelect.vue
+++ b/src/views/xm/core/components/XmProductSelect.vue
@@ -359,12 +359,17 @@ export default {
           if (tips.isOk) {
             this.pageInfo.total = res.data.total;
             this.pageInfo.count = false;
-            this.xmProducts = res.data.data;
-            if (this.iterationId) {
-              map.set(this.iterationId, this.xmProducts);
-            } else if (this.linkProjectId) {
-              map.set(this.linkProjectId, this.xmProducts);
-            }
+            this.xmProducts = res.data.data; 
+
+            var key=""
+						if(this.iterationId){
+							key='xm-product-select-list-it-'+this.iterationId 
+							sessionStorage.setItem(key,JSON.stringify(this.xmProducts))
+						}else if(this.linkProjectId){
+							key='xm-product-select-list-prj-'+this.linkProjectId  
+							sessionStorage.setItem(key,JSON.stringify(this.xmProducts))
+						}
+
             if (
               this.autoSelect !== false &&
               this.xmProducts.length > 0 &&
@@ -436,24 +441,17 @@ export default {
     },
 
     initData() {
-      if (this.iterationId) {
-        var xmProducts = map.get(this.iterationId);
-        if (xmProducts) {
-          this.xmProducts = xmProducts;
-          if (this.productVisible == false) {
-            if (this.autoSelect !== false && this.xmProducts.length > 0) {
-              var row = this.xmProducts[0];
-              this.$refs.table.setCurrentRow(row);
-              this.rowClick(row);
-            }
-          }
-        } else {
-          this.searchXmProducts();
-        }
-      } else if (this.linkProjectId) {
-        var xmProducts = map.get(this.linkProjectId);
-        if (xmProducts) {
-          this.xmProducts = xmProducts;
+      var key=""
+      if(this.iterationId){
+        key='xm-product-select-list-it-'+this.iterationId 
+      }else if(this.linkProjectId){
+        key='xm-product-select-list-prj-'+this.linkProjectId 
+      }
+
+      if(key){
+        var xmProductStr=sessionStorage.getItem(key);
+        if(xmProductStr && xmProductStr!='null' && xmProductStr!='undefined'){  
+          this.xmProducts = JSON.parse(xmProductStr);
           if (this.productVisible == false) {
             if (this.autoSelect !== false && this.xmProducts.length > 0) {
               var row = this.xmProducts[0];
@@ -463,7 +461,7 @@ export default {
           }
         } else {
           this.searchXmProducts();
-        }
+        } 
       } else {
         this.searchXmProducts();
       }
diff --git a/src/views/xm/core/components/XmProjectSelect.vue b/src/views/xm/core/components/XmProjectSelect.vue
index 9f5f705e..b3450477 100644
--- a/src/views/xm/core/components/XmProjectSelect.vue
+++ b/src/views/xm/core/components/XmProjectSelect.vue
@@ -356,12 +356,16 @@ export default {
           if (tips.isOk) {
             this.pageInfo.total = res.data.total;
             this.pageInfo.count = false;
-            this.xmProjects = res.data.data;
-            if (this.linkIterationId) {
-              map.set(this.linkIterationId, this.xmProjects);
-            } else if (this.linkProductId) {
-              map.set(this.linkProductId, this.xmProjects);
-            }
+            this.xmProjects = res.data.data; 
+            
+            var key=""
+						if(this.linkIterationId){
+							key='xm-project-select-list-it-'+this.linkIterationId 
+							sessionStorage.setItem(key,JSON.stringify(this.xmProjects))
+						}else if(this.linkProductId){
+							key='xm-project-select-list-prd-'+this.linkProductId  
+							sessionStorage.setItem(key,JSON.stringify(this.xmProjects))
+						}
             if (
               this.autoSelect !== false &&
               this.xmProjects.length > 0 &&
@@ -434,24 +438,18 @@ export default {
     },
 
     initData() {
-      if (this.linkIterationId) {
-        var xmProjects = map.get(this.linkIterationId);
-        if (xmProjects) {
-          this.xmProjects = xmProjects;
-          if (this.projectVisible == false) {
-            if (this.autoSelect !== false && this.xmProjects.length > 0) {
-              var row = this.xmProjects[0];
-              this.$refs.table.setCurrentRow(row);
-              this.rowClick(row);
-            }
-          }
-        } else {
-          this.searchXmProjects();
-        }
-      } else if (this.linkProductId) {
-        var xmProjects = map.get(this.linkProductId);
-        if (xmProjects) {
-          this.xmProjects = xmProjects;
+      
+      var key=""
+      if(this.linkIterationId){
+        key='xm-project-select-list-it-'+this.linkIterationId 
+      }else if(this.linkProductId){
+        key='xm-project-select-list-prd-'+this.linkProductId 
+      }
+
+      if(key){
+        var xmProjectStr=sessionStorage.getItem(key);
+        if(xmProjectStr && xmProjectStr!='null' && xmProjectStr!='undefined'){   
+          this.xmProjects = JSON.parse(xmProjectStr);
           if (this.projectVisible == false) {
             if (this.autoSelect !== false && this.xmProjects.length > 0) {
               var row = this.xmProjects[0];
@@ -461,7 +459,7 @@ export default {
           }
         } else {
           this.searchXmProjects();
-        }
+        } 
       } else {
         this.searchXmProjects();
       }