From a1ab7cda31b379aba35e597c0743c3af9898ce86 Mon Sep 17 00:00:00 2001 From: mashuai Date: Fri, 7 Nov 2025 16:34:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clz/service/impl/MaterialLeaseInfoServiceImpl.java | 9 ++++++--- .../lease/service/impl/LeaseTaskServiceImpl.java | 4 +++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java index b369bccf..1fd29c89 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java @@ -1388,8 +1388,9 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService { // 班组类型固定传值 tbTeam.setTypeId(1731L); } - - BmTeam bmTeam = bmTeamMapper.selectByName(tbTeam); + BmTeam dto = new BmTeam(); + dto.setTeamName(leaseApplyRequestVo.getLeaseApplyInfo().getTeamName()); + BmTeam bmTeam = bmTeamMapper.selectByName(dto); if (bmTeam == null) { // 新增班组 tbTeam.setCreateUser(SecurityUtils.getLoginUser().getUserid().toString()); @@ -1544,7 +1545,9 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService { tbTeam.setRelPhone(StringUtils.isNotBlank(leaseApplyRequestVo.getLeaseApplyInfo().getRelPhone()) ? leaseApplyRequestVo.getLeaseApplyInfo().getRelPhone() : null); // 班组类型固定传值 tbTeam.setTypeId(1731L); - BmTeam bmTeam = bmTeamMapper.selectByName(tbTeam); + BmTeam dto = new BmTeam(); + dto.setTeamName(leaseApplyRequestVo.getLeaseApplyInfo().getTeamName()); + BmTeam bmTeam = bmTeamMapper.selectByName(dto); if (bmTeam == null) { // 新增班组 tbTeam.setCreateUser(SecurityUtils.getLoginUser().getUserid().toString()); 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 69418fcc..eeff22c9 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 @@ -239,7 +239,9 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService { // 班组类型固定传值 bmTeam.setTypeId(1731L); // 根据班组名称去bm_unit表查询班组信息 - BmTeam bmTeam1 = bmTeamMapper.selectByName(bmTeam); + BmTeam dto = new BmTeam(); + dto.setTeamName(StringUtils.isNotBlank(iwsTeamUserVo.getTeamName()) ? iwsTeamUserVo.getTeamName() : null); + BmTeam bmTeam1 = bmTeamMapper.selectByName(dto); if (bmTeam1 == null) { // 走新增逻辑 int result = bmTeamMapper.insert(bmTeam);