Index: ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/dwr/table/BorrowRecordTableManager.java
===================================================================
diff -u -r12331 -r14239
--- ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/dwr/table/BorrowRecordTableManager.java	(.../BorrowRecordTableManager.java)	(revision 12331)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/dwr/table/BorrowRecordTableManager.java	(.../BorrowRecordTableManager.java)	(revision 14239)
@@ -20,11 +20,16 @@
 		Map<String, String> sqlWhereParamMap = gridManager
 				.getParamFromView(parameterMap);
 		String sql = "where 1=1";
+		//判断是否配置查看科室互借的权限,如未配置则只能看借出科室为当前登录用户科室或借入科室为当前登录用户科室的单
 		String applicationShowAll = sqlWhereParamMap.get("applicationShowAll");
 		if (!"true".equals(applicationShowAll)) {
-			sql += " and po.rentalDepartCode = '"
+			sql += " and (po.rentalDepartCode = '"
 					+ AcegiHelper.getLoginUser()
 							.getCurrentOrgUnitCode() + "'";
+			
+			sql += " or po.departCode = '"
+					+ AcegiHelper.getLoginUser()
+							.getCurrentOrgUnitCode() + "')";
 		}
 		return gridManager.renderGrid(parameterMap,
 				BorrowRecord.class.getSimpleName(), sql, new String[] {