diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseTaskMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseTaskMapper.java index abc1546d..87156455 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseTaskMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseTaskMapper.java @@ -368,5 +368,5 @@ public interface LeaseTaskMapper { * 查询领用申请三级分类 * @return */ - List selectLeaseThreeTypeLease(); + List selectLeaseThreeTypeLease(Long deptId); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java index 1e1ca145..29dcd2d9 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java @@ -1522,7 +1522,8 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService { */ @Override public List getEquipmentThreeTypeLease() { - List maTypes = mapper.selectLeaseThreeTypeLease(); + Long deptId = typeService.getUserDeptId(); + List maTypes = mapper.selectLeaseThreeTypeLease(deptId); List list = new ArrayList<>(); for (Type maType : maTypes) { if (maType.getParentId() == 0) { diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml index 445e4570..653fef03 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml @@ -1372,5 +1372,12 @@ m.type_name AS label FROM ma_type m WHERE m.del_flag = '0' and m.is_lease = 0 + + AND CASE + WHEN (#{deptId} = 102 or #{deptId} = 327) THEN m.company_id= 101 + WHEN #{deptId} = 309 THEN (m.company_id=#{deptId}) or (m.company_id=101 and m.jiju_type=1) + ELSE m.type_id=-1 + END + diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml index 633e6702..16470d9a 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml @@ -140,7 +140,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" GROUP BY pmc.AGREEMENT_ID, pmc.TYPE - order by a.pushStatus,bma.agreement_code + order by sd.order_num,a.pushStatus diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/MybatisGenerator.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/MybatisGenerator.xml index ea2a59c1..9e82b8e0 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/MybatisGenerator.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/MybatisGenerator.xml @@ -84,8 +84,11 @@ AND bai.unit_id = #{unitId} + + AND sd.dept_name = #{impUnitName} + GROUP BY bai.agreement_id - order by a.pushStatus + order by sd.order_num,a.pushStatus @@ -146,10 +149,13 @@ AND bu.unit_id = #{unitId} + + AND sd.dept_name = #{impUnitName} + GROUP BY bai.project_id, bai.unit_id ORDER BY - pmia.push_status + sd.order_num,pmia.push_status