From aba67051f6f2badd54709df2165c1a41b3f1cbf3 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Mon, 18 Aug 2025 16:09:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BB=84=E9=80=80=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BackApplyInfoController.java   |  4 +++
 .../impl/BackApplyInfoServiceImpl.java        | 26 +++++++------------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java
index c41cc907..e325a3e9 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java
@@ -10,6 +10,7 @@ import javax.validation.constraints.NotNull;
 
 import cn.hutool.core.convert.Convert;
 import com.bonus.common.biz.config.ListPagingUtil;
+import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.ServletUtils;
 import com.bonus.common.log.enums.OperaType;
 import com.bonus.material.archives.service.ArchivesService;
@@ -371,6 +372,9 @@ public class BackApplyInfoController extends BaseController {
     public AjaxResult submitBackApply(@RequestBody BackApplyInfo backApplyInfo) {
         try {
             BmUnit unit = taskMapper.selectBmUnitInfo(backApplyInfo);
+            if (unit != null && unit.getTypeId() == null) {
+                throw new ServiceException("单位类型为空");
+            }
             if (unit != null && unit.getTypeId() == 1731L) {
                 // 班组退料提交
                 return backApplyInfoService.submitBzBackApply(backApplyInfo);
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java
index 3c540b4e..2318d149 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java
@@ -2041,25 +2041,19 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService {
         if (backApplyInfo.getUnitId() == null || backApplyInfo.getProId() == null) {
             return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "参数不能为空");
         }
-        BmUnit queryUnitInfo = bmUnitMapper.selectBmUnitByUnitId(backApplyInfo.getUnitId());
-        if (queryUnitInfo.getTypeId() == null) {
-            throw new ServiceException("单位类型为空");
-        }
         // 如果单位类型为班组，则查询该班在机具签署✍️的协议ID
         LeaseOutDetails leaseOutDetail = new LeaseOutDetails();
-        if (queryUnitInfo.getTypeId() == 1731L) {
-            // 查询班组挂靠的项目部协议信息
-            leaseOutDetail = leaseApplyInfoMapper.selectProjectUnitAgreementIdByTeamAndProject(
-                            Math.toIntExact(backApplyInfo.getUnitId()),
-                            Math.toIntExact(backApplyInfo.getProId())
-                    );
-            if (leaseOutDetail == null) {
-                throw new ServiceException("项目部协议信息查询为空");
-            }
-            // 把后续流程设置为项目部的协议进行处理
-            backApplyInfo.setAgreementId(leaseOutDetail.getProjectUnitAgreementId());
-            backApplyInfo.setUnitId(leaseOutDetail.getProjectUnitAgreementId());
+        // 查询班组挂靠的项目部协议信息
+        leaseOutDetail = leaseApplyInfoMapper.selectProjectUnitAgreementIdByTeamAndProject(
+                Math.toIntExact(backApplyInfo.getUnitId()),
+                Math.toIntExact(backApplyInfo.getProId())
+        );
+        if (leaseOutDetail == null) {
+            throw new ServiceException("项目部协议信息查询为空");
         }
+        // 把后续流程设置为项目部的协议进行处理
+        backApplyInfo.setAgreementId(leaseOutDetail.getProjectUnitAgreementId());
+        backApplyInfo.setUnitId(leaseOutDetail.getProjectUnitAgreementId());
         SelectDto dto = new SelectDto();
         dto.setProId(backApplyInfo.getProId()).setUnitId(Math.toIntExact(backApplyInfo.getUnitId()));
         List<AgreementVo> list = mapper.getAgreementInfoByIdBack(dto);