Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
===================================================================
diff -u -r35031 -r35077
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 35031)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 35077)
@@ -40,6 +40,7 @@
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.urgent.UrgentLevel;
 import com.forgon.entity.PageEntity;
+import com.forgon.security.service.OperationManager;
 import com.forgon.systemsetting.service.HttpOptionManager;
 import com.forgon.tools.Constants;
 import com.forgon.tools.GB2Alpha;
@@ -114,6 +115,8 @@
 
 	private SupplyRoomConfigManager supplyRoomConfigManager;
 	
+	private OperationManager operationManager;
+	
 	private ObjectDao objectDao;
 
 	private OrgUnitManager orgUnitManager;
@@ -242,6 +245,9 @@
 		this.supplyRoomConfigManager = supplyRoomConfigManager;
 	}
 	
+	public void setOperationManager(OperationManager operationManager) {
+		this.operationManager = operationManager;
+	}
 	public void update(){
 		supplyRoomConfigManager.updateDepartmentCode();
 	}
@@ -1970,7 +1976,8 @@
 			Integer noOperationTime = supplyRoomConfig.getNoOperationTime();
 			if(supplyRoomConfig != null
 					&& StringUtils.equals(supplyRoomConfig.getDashboardsScreenSaver(), Constants.STR_YES)
-					&& noOperationTime != null && noOperationTime > 0){
+					&& noOperationTime != null && noOperationTime > 0
+					&& operationManager.isCurrentUserHaveAnyOperation("SSTS_RealTimeDashboards")){
 				HttpSession session = StrutsParamUtils.getRequest().getSession();
 				Date noOperationStartTime = (Date)session.getAttribute("noOperationStartTime");
 				if(noOperationStartTime != null){
@@ -1981,6 +1988,8 @@
 					if(diff >= noOperationTime.intValue()
 							&& !showingDashboards){
 						success = true;
+						//跳转到数据实时看板后，重置“无操作开始时间”
+						session.setAttribute("noOperationStartTime", cal.getTime());
 					}
 					json.put("noOperationStartTime", DateTools.getFormatDateStr(noOperationStartTime, DateTools.COMMON_DATE_HMS));
 					json.put("nowTime", DateTools.getFormatDateStr(cal.getTime(), DateTools.COMMON_DATE_HMS));