diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java index 509f01e0..ba28a879 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java @@ -608,6 +608,8 @@ public class SelectServiceImpl implements SelectService { */ @Override public List getImpUnitNameList(MaterialRetainedEquipmentInfo bean) { + Long companyId=typeService.getUserDeptId(); + bean.setCompanyId(companyId.intValue()); return mapper.getImpUnitNameList(bean); } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml index 52ce15e5..2e1f62a5 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml @@ -1427,6 +1427,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND bp.pro_name LIKE CONCAT('%', #{proName}, '%') + + AND bp.company_id=#{companyId} + AND bp.external_id in