Index: ssts-web/src/main/webapp/ext/js/multiSelectCombo.js
===================================================================
diff -u -r22162 -r30243
--- ssts-web/src/main/webapp/ext/js/multiSelectCombo.js	(.../multiSelectCombo.js)	(revision 22162)
+++ ssts-web/src/main/webapp/ext/js/multiSelectCombo.js	(.../multiSelectCombo.js)	(revision 30243)
@@ -79,8 +79,12 @@
     },  
     getCheckedDisplay: function ()   
     {  
-        var re = new RegExp(this.separator, "g");  
-        return this.getCheckedValue(this.displayField).replace(re, this.separator + ' ');  
+        var re = new RegExp(this.separator, "g");
+        if(this.getCheckedValue(this.displayField).indexOf('全部') == -1){
+            return this.getCheckedValue(this.displayField).replace(re, this.separator + ' '); 
+        }else {
+            return '全部'
+        }
     },  
     getCheckedValue: function (field)   
     {  
@@ -126,13 +130,18 @@
   
         Ext.each(rva, function (v)   
         {  
-            snapshot.each(function (r)   
-            {  
-                if (v === r.get(this.displayField))   
-                {  
+            if(v == '全部'){
+                snapshot.each(function (r){  
                     va.push(r.get(this.valueField));  
-                }  
-            }, this);  
+                }, this);  
+            }else {
+                snapshot.each(function (r)  {  
+                    if (v === r.get(this.displayField)) {  
+                        va.push(r.get(this.valueField));  
+                    }
+                }, this);  
+            }
+            
         }, this);  
         this.setValue(va.join(this.separator));  
         this.store.clearFilter();