Index: ssts-web/src/test/java/test/forgon/directory/service/OrgUnitManagerTest.java
===================================================================
diff -u -r18024 -r18461
--- ssts-web/src/test/java/test/forgon/directory/service/OrgUnitManagerTest.java	(.../OrgUnitManagerTest.java)	(revision 18024)
+++ ssts-web/src/test/java/test/forgon/directory/service/OrgUnitManagerTest.java	(.../OrgUnitManagerTest.java)	(revision 18461)
@@ -117,10 +117,13 @@
 			assertTrue((StringTools.equals(or.getUser().getName(), "admin") || StringTools.equals(or.getUser().getName(), "cssduser3")));
 		}
 		//在WareHouse（仓库）有一条记录
-		ResultSet rs = objectDao.executeSql(String.format("select orgUnitId from WareHouse where orgUnitCode='%s'", testCode1));
+		ResultSet rs = objectDao.executeSql(String.format("select count(*) cnt from WareHouse where orgUnitCode='%s'", testCode1));
 		try {
 			if(rs.next()){
-				assertEquals(rs.getLong("orgUnitId"), orgUnit.getId().longValue());
+				//目前已经去掉了orgUnitId字段,所以下面这一行的断言去掉
+//				assertEquals(rs.getLong("orgUnitId"), orgUnit.getId().longValue());
+				//改为断言数量是否为1
+				assertEquals(rs.getInt("cnt"), 1);
 			}
 		} catch (Exception e) {
 			e.printStackTrace();