diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java index e9a86983..0366322a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java @@ -769,7 +769,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { if (!hasSpecialRole) { leaseApplyInfo.setUserId(SecurityUtils.getLoginUser().getUserid()); }*/ - leaseApplyInfo.setUserId(SecurityUtils.getLoginUser().getUserid()); +// leaseApplyInfo.setUserId(SecurityUtils.getLoginUser().getUserid()); //用leaseApplyInfo.getQueryType的值来区分是否是领用出库查询,如果是,时间筛选为发布时间 List list = leaseApplyInfoMapper.selectLeaseApplyInfoList(leaseApplyInfo); // 如果statusList包含3、4、5,则为领料出库查询 diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml index 05827c44..e5a4e96e 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml @@ -776,10 +776,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" END AS status, bp.pro_id AS proId, bp.pro_name AS proName, - bu.unit_name AS teamName, + IF(csi.`status` = 0,bu.unit_name,"") AS teamName, bu.bzz_idcard AS idCard, mm.qr_code AS qrCode, - bz.ssfbdw AS subUnitName + IF(csi.`status` = 0,bz.ssfbdw,"") AS subUnitName FROM slt_agreement_info sai LEFT JOIN bm_agreement_info bai ON sai.agreement_id = bai.agreement_id