Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java =================================================================== diff -u -r20153 -r20175 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 20153) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 20175) @@ -38,6 +38,8 @@ import com.beust.jcommander.ParameterException; import com.forgon.directory.acegi.tools.AcegiHelper; +import com.forgon.directory.model.OrgUnit; +import com.forgon.directory.service.OrgUnitManager; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; import com.forgon.disinfectsystem.common.Constants; import com.forgon.disinfectsystem.common.CssdUtils; @@ -81,6 +83,7 @@ import com.forgon.tools.StrutsResponseUtils; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; +import com.forgon.tools.json.JSONUtil; import com.forgon.tools.json.JsonPropertyFilter; import com.forgon.tools.string.StringTools; import com.forgon.tools.util.ForgonDateUtils; @@ -137,7 +140,13 @@ private GoodFilterConfigManager goodFilterConfigManagerImpl; private ApplicationLogManager applicationLogManager; + + private OrgUnitManager orgUnitManager; + public void setOrgUnitManager(OrgUnitManager orgUnitManager) { + this.orgUnitManager = orgUnitManager; + } + public void setApplicationLogManager(ApplicationLogManager applicationLogManager) { this.applicationLogManager = applicationLogManager; } @@ -485,6 +494,13 @@ // 检查并创建还物单或通用申请单 private JSONObject createReturnApplicationOrRecyclingApplication() { + String departCoding = recyclingApplication.getDepartCoding(); + + OrgUnit department = (OrgUnit) orgUnitManager.getOrgUnitByCode(departCoding); + if (department == null || !StringTools.equals(recyclingApplication.getDepart(), department.getName())) { + return JSONUtil.buildJsonObject(false, "申请科室名称和科室编码不一致,请联系系统管理员!"); + } + Collection srcTousseItemVoList = getTousseItemVos(); Map> checkList = new HashMap<>();