Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/dwr/table/InvoiceTableManager.java
===================================================================
diff -u -r29011 -r29139
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/dwr/table/InvoiceTableManager.java	(.../InvoiceTableManager.java)	(revision 29011)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/dwr/table/InvoiceTableManager.java	(.../InvoiceTableManager.java)	(revision 29139)
@@ -189,31 +189,33 @@
 		//根据时间过滤
 		String startTime = sqlWhereParamMap.get("startTime");
 		String endTime = sqlWhereParamMap.get("endTime");
-		//如果开始时间为空则取当天的开始时间或者取当月的开始时间（看配置）
-		if (StringUtils.isBlank(startTime)) {
-			boolean startDateIsToday = CssdUtils.getSystemSetConfigByNameBool("startDateIsToday");
-			if (startDateIsToday) {
-				Calendar date = Calendar.getInstance(Locale.CHINA);
-				date.set(Calendar.HOUR_OF_DAY, 0);
-				date.set(Calendar.MINUTE, 0);
-				date.set(Calendar.SECOND, 0);
-				startTime = date.getTimeInMillis() + "";
-			} else {
-				Date date = DateUtils.setDays(new Date(), 1);
-				startTime = date.getTime() + "";
+		if((StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) || !supplyRoomConfigManager.isSupplyRoomUser(AcegiHelper.getLoginUser())){
+			//如果开始时间为空则取当天的开始时间或者取当月的开始时间（看配置）
+			if (StringUtils.isBlank(startTime)) {
+				boolean startDateIsToday = CssdUtils.getSystemSetConfigByNameBool("startDateIsToday");
+				if (startDateIsToday) {
+					Calendar date = Calendar.getInstance(Locale.CHINA);
+					date.set(Calendar.HOUR_OF_DAY, 0);
+					date.set(Calendar.MINUTE, 0);
+					date.set(Calendar.SECOND, 0);
+					startTime = date.getTimeInMillis() + "";
+				} else {
+					Date date = DateUtils.setDays(new Date(), 1);
+					startTime = date.getTime() + "";
+				}
 			}
+			//如果结束时间为空则取当前时间
+			if (StringUtils.isBlank(endTime)) {
+				endTime = System.currentTimeMillis() + "";
+			}
+			if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+				String start;
+				String end;
+				start = dateQueryAdapter.dateAdapter(new java.sql.Date(Long.parseLong(startTime)));
+				end = dateQueryAdapter.dateAdapter(new java.sql.Date(Long.parseLong(endTime)));
+				sql += String.format(" AND (po.sendTime >= %s and po.sendTime < %s) ", start, end);
+			}
 		}
-		//如果结束时间为空则取当前时间
-		if (StringUtils.isBlank(endTime)) {
-			endTime = System.currentTimeMillis() + "";
-		}
-		if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
-			String start;
-			String end;
-			start = dateQueryAdapter.dateAdapter(new java.sql.Date(Long.parseLong(startTime)));
-			end = dateQueryAdapter.dateAdapter(new java.sql.Date(Long.parseLong(endTime)));
-			sql += String.format(" AND (po.sendTime >= %s and po.sendTime < %s) ", start, end);
-		}
 
 		//按申请科室
 		String applyDepartmentCode = sqlWhereParamMap.get("applyDepartmentCode");