From 44efcb43dd450edec6e75740aba828e802e12c2e Mon Sep 17 00:00:00 2001 From: jiask <1069621233@qq.com> Date: Mon, 26 Jan 2026 10:24:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?jsk=20=20=E8=A7=A3=E5=86=B3=E5=90=B4?= =?UTF-8?q?=E7=BF=A0=E6=9E=97=E8=B4=A6=E5=8F=B7=E6=97=A0=E6=B3=95=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=A2=86=E6=96=99=E5=87=BA=E5=BA=93=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/lease/service/impl/LeaseApplyInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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，则为领料出库查询 From e70b9061d3497c5c5f42f189378820cb47e48c4a Mon Sep 17 00:00:00 2001 From: bonus <1203338439@qq.com> Date: Mon, 26 Jan 2026 11:09:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9D=90=E6=96=99=E7=AB=99=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E7=8F=AD=E7=BB=84=E5=B1=95=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/material/clz/MaterialMachineMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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