Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r35731 -r35734 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 35731) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 35734) @@ -10159,6 +10159,10 @@ if(CollectionUtils.isEmpty(tdIds)){ return null; } + String orgUnitCoding = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig(); + if(StringUtils.isBlank(orgUnitCoding)){ + throw new SystemException("登录用户没有所属供应室"); + } StringBuffer stringBuffer = new StringBuffer(); stringBuffer.append("select distinct tdcom.name comTousseName,td.name tdName,td.id from "); stringBuffer.append(ComboTousseComposite.class.getSimpleName()); @@ -10172,6 +10176,7 @@ stringBuffer.append(PackingTask.class.getSimpleName()); stringBuffer.append(" pt on pt.tousseDefinition_id=td.id join "+ ComboTousseOrgUint.class.getSimpleName() +" ct on ct.combotoussedefinitionid=c.combotoussedefinitionid where "); stringBuffer.append(SqlUtils.getNonStringFieldInLargeCollectionsPredicate("td.id", tdIds)); + stringBuffer.append(" and tdcom.handlerDepartCode='"+ orgUnitCoding +"' "); ResultSet rs = null; Map infoMap = new HashMap(); JSONArray arr = new JSONArray();