Index: ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
===================================================================
diff -u -r17645 -r17649
--- ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java	(.../AbstractCSSDTest.java)	(revision 17645)
+++ ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java	(.../AbstractCSSDTest.java)	(revision 17649)
@@ -3269,16 +3269,17 @@
 		orgUnitCSSDId = orgUnitCSSD.getId().toString();
 		String orgUnitORId = orgUnitOR.getId().toString();
 		String neikeId = neike.getId().toString();
+		String orgUnitROOTCode = orgUnitROOT.getOrgUnitCoding();
 		
 		//初始化“operationdefine.xml”配置的权限
 		initOperation();
-		Role role_系统管理员 = roleManager.getRoleByRoleDescn("系统管理员");
-		Role role_申领员 = createRole_申领员("1", orgUnitROOT.getOrgUnitCoding(), null);
-		Role role_回收员 = createRole_回收员("2", orgUnitROOT.getOrgUnitCoding(), null);
-		Role role_清洗员 = createRole_清洗员("3", orgUnitROOT.getOrgUnitCoding(), null);
-		Role role_装配员 = createRole_装配员("4", orgUnitROOT.getOrgUnitCoding(), null);
-		Role role_审核员 = createRole_审核员("5", orgUnitROOT.getOrgUnitCoding(), null);
-		Role role_灭菌员 = createRole_灭菌员("6", orgUnitROOT.getOrgUnitCoding(), null);
+		Role role_系统管理员 = createRole_系统管理员("0", orgUnitROOTCode, null);
+		Role role_申领员 = createRole_申领员("1", orgUnitROOTCode, null);
+		Role role_回收员 = createRole_回收员("2", orgUnitROOTCode, null);
+		Role role_清洗员 = createRole_清洗员("3", orgUnitROOTCode, null);
+		Role role_装配员 = createRole_装配员("4", orgUnitROOTCode, null);
+		Role role_审核员 = createRole_审核员("5", orgUnitROOTCode, null);
+		Role role_灭菌员 = createRole_灭菌员("6", orgUnitROOTCode, null);
 		String rId0 = role_系统管理员.getId().toString();
 		String rId1 = role_申领员.getId().toString();
 		String rId2 = role_回收员.getId().toString();
@@ -3309,6 +3310,27 @@
 	}
 	
 	/**
+	 * 创建“系统管理员”角色
+	 * @param simpleName		角色id
+	 * @param companyId			科室编码	
+	 * @param parentIds			父角色的id集合，用逗号分隔	
+	 * @return					此角色对象
+	 */
+	private Role createRole_系统管理员(String simpleName, String companyId, String parentIds) {
+		Set<Operation> xmlOperationList = operationManager
+				.getOperationListFromXml();
+		int length = xmlOperationList.size();
+		String[] operationIds = new String[length];
+		int temp = 0;
+		for (Operation o : xmlOperationList) {
+			operationIds[temp] = o.getOperationId();
+			temp ++;
+		}
+		
+		Role role = createRole(simpleName, "系统管理员", companyId, operationIds, parentIds);
+		return role;
+	}
+	/**
 	 * 创建“申领员”角色
 	 * @param simpleName		角色id
 	 * @param companyId			科室编码