Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/deviceMaintenanceCusReportView.js
===================================================================
diff -u -r39549 -r39588
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/deviceMaintenanceCusReportView.js	(.../deviceMaintenanceCusReportView.js)	(revision 39549)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/deviceMaintenanceCusReportView.js	(.../deviceMaintenanceCusReportView.js)	(revision 39588)
@@ -107,31 +107,28 @@
 			{name: 'name', type: 'string'}
 		]);
 
-		var deviceMaintenanceCusGroupStore;
-		if(sstsConfig.enableGroupManagementOfDeviceMaintenanceFunction){
-			deviceMaintenanceCusGroupStore = new top.Ext.data.Store({
-				proxy : new top.Ext.data.HttpProxy({
-					url : WWWROOT + '/disinfectSystem/devicemaintenancecus/deviceMaintenanceCusGroupController/getDeviceMaintenanceCusGroupForSelect.mhtml',
-					method : 'POST'
-				}),
-				reader : new top.Ext.data.JsonReader({
-					root : 'data'
-				},[
-					{name : 'id',mapping : 'id'},
-					{name : 'name',mapping : 'name'}
-				]),
-				listeners:{
-					load :function (thiz,records,options ){
-						if(records.length > 1){
-							deviceMaintenanceCusGroupStore.insert(0 , new deviceMaintenanceCusGroupRecord({'id':'全部','name':'全部'}));
-							Ext.getCmp('deviceMaintenanceCusGroupIds').selectAll();
-						}
+		var deviceMaintenanceCusGroupStore = new top.Ext.data.Store({
+			proxy : new top.Ext.data.HttpProxy({
+				url : WWWROOT + '/disinfectSystem/devicemaintenancecus/deviceMaintenanceCusGroupController/getDeviceMaintenanceCusGroupForSelect.mhtml',
+				method : 'POST'
+			}),
+			reader : new top.Ext.data.JsonReader({
+				root : 'data'
+			},[
+				{name : 'id',mapping : 'id'},
+				{name : 'name',mapping : 'name'}
+			]),
+			listeners:{
+				load :function (thiz,records,options ){
+					if(records.length > 1){
+						deviceMaintenanceCusGroupStore.insert(0 , new deviceMaintenanceCusGroupRecord({'id':'全部','name':'全部'}));
+						Ext.getCmp('deviceMaintenanceCusGroupIds').selectAll();
 					}
 				}
-			});
-	
-			deviceMaintenanceCusGroupStore.load();
-		}
+			}
+		});
+
+		deviceMaintenanceCusGroupStore.load();
 		
 		var form = new Ext.form.FormPanel({
 			title : '设备维护报表',
Index: ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomDefView.js
===================================================================
diff -u -r39542 -r39588
--- ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomDefView.js	(.../deviceMaintenanceCostomDefView.js)	(revision 39542)
+++ ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomDefView.js	(.../deviceMaintenanceCostomDefView.js)	(revision 39588)
@@ -484,7 +484,7 @@
 				lazyInit : true,
 				triggerAction : 'all',
 				typeAhead : false,
-				allowBlank : true,
+				allowBlank : !sstsConfig.enableGroupManagementOfDeviceMaintenanceFunction,
 				anchor : '100%',
 				listeners:{
 					select:function(combo, record, index){