Index: ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReport.jsp =================================================================== diff -u -r36250 -r36256 --- ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReport.jsp (.../problemReport.jsp) (revision 36250) +++ ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReport.jsp (.../problemReport.jsp) (revision 36256) @@ -1,17 +1,20 @@ <%@page import="java.util.Date"%> +<%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%> <%@page import="com.forgon.systemsetting.model.HttpOption"%> <%@page import="com.forgon.systemsetting.service.HttpOptionManager"%> <%@page import="java.util.List"%> <%@page import="java.text.SimpleDateFormat"%> <%@ page contentType="text/html; charset=UTF-8"%> <%@ include file="/common/taglibs.jsp"%> <% + SupplyRoomConfigManager supplyRoomConfigManager =(SupplyRoomConfigManager) SpringBeanManger.getBean("supplyRoomConfigManager"); request.setAttribute("userName",AcegiHelper.getLoginUser().getUserFullName()); request.setAttribute("orgunit",AcegiHelper.getLoginUser().getCurrentOrgUnitName()); request.setAttribute("orgUnitCoding",AcegiHelper.getLoginUser().getCurrentOrgUnitCode()); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); request.setAttribute("today", dateFormat.format(new Date())); - request.setAttribute("firstSupplyRoomUser",AcegiHelper.getLoginUser().getFirstSupplyRoomUser()); + String currentOrgUnitCode = AcegiHelper.getLoginUser().getCurrentOrgUnitCode(); + request.setAttribute("firstSupplyRoomUser",supplyRoomConfigManager.isFirstSupplyRoomOrgUnit(currentOrgUnitCode)); %> <% @@ -32,6 +35,7 @@ var causeList = '${causeList}'; var newId = '${param.id}'; var firstSupplyRoomUser = '${firstSupplyRoomUser}'; + console.log(firstSupplyRoomUser) var list = []; if(causeList.length > 2){ causeList = causeList.substr(1,(causeList.length-2)).replace(/\s/g,"");