Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r34434 -r34636 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 34434) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 34636) @@ -317,15 +317,15 @@ public void loadDepartmentAppTemplateForRecycle(){ String orgUnitCoding = StrutsParamUtils.getPraramValue("orgUnitCoding", ""); // 申领模板id - String templateId = StrutsParamUtils.getPraramValue("templateId", null); + String templateId = StrutsParamUtils.getPraramValue("templateIds", null); JSONArray array = new JSONArray(); String arrays = ""; List list = null; - if(DatabaseUtil.isPoIdValid(templateId)){ + if(StringUtils.isNotBlank(templateId)){ // 申领模板id不为空,表示已经从模板下拉框选中申领模板 list = new ArrayList(); - DepartmentAppTemplate departmentAppTemplate = departmentAppTemplateManager.getAppTemplateById(templateId); - list.add(departmentAppTemplate); + List departmentAppTemplates = departmentAppTemplateManager.getAppTemplateListByIds(templateId); + list.addAll(departmentAppTemplates); } else if(StringUtils.isNotBlank(orgUnitCoding)){ // 申领模板id为空,并且科室编码不为空,表示选中科室后加载改科室下的所有申领模板 list = departmentAppTemplateManager.getDepartmentAppTemplates(orgUnitCoding);