Index: forgon-core/src/main/java/com/forgon/security/tools/Util.java
===================================================================
diff -u -r14831 -r16740
--- forgon-core/src/main/java/com/forgon/security/tools/Util.java	(.../Util.java)	(revision 14831)
+++ forgon-core/src/main/java/com/forgon/security/tools/Util.java	(.../Util.java)	(revision 16740)
@@ -42,6 +42,11 @@
 		return userOperations;
 	}
 	
+	/**
+	 * 获取roles角色集合包括继承的角色的所有权限（采用递归算法）
+	 * @param roles
+	 * @return
+	 */
 	public static Set<Operation> getOperationsOfRoles(Set<Role> roles){
 		Set<Operation> userOperations = new HashSet<Operation>();
 		if (roles != null){
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
===================================================================
diff -u -r16731 -r16740
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 16731)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 16740)
@@ -321,9 +321,6 @@
 					anchor : '95%'
 				}]
 			},{
-				
-				////////////////
-				
 				columnWidth : .25,
 				layout : 'form',
 				labelWidth : 70,
@@ -337,7 +334,6 @@
 					editable : false,
 					fieldLabel:'器械包分组',
 					triggerAction : 'all',
-					
 					//--------------------//
 //					mode:'local',
 					store : new Ext.data.SimpleStore({
@@ -359,9 +355,6 @@
 					//---------------------------//
 					anchor : '95%'
 				}]
-				
-				
-				////////////////
 			}]
 		},{
 			width :120,
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
===================================================================
diff -u -r16714 -r16740
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 16714)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 16740)
@@ -19,7 +19,6 @@
 import com.forgon.Constants;
 import com.forgon.directory.model.BarcodeDevice;
 import com.forgon.disinfectsystem.basedatamanager.toussedefinition.service.TousseInstanceUtils;
-import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatch;
 import com.forgon.disinfectsystem.entity.sterilizationmanager.foreignproxydisinfection.ForeignProxyDisinfection;
 import com.forgon.disinfectsystem.entity.sterilizationmanager.foreignproxydisinfection.ForeignProxyItem;
 import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord;