From 86547bba1bcc96c6f181137a906ca376f3ecc6b9 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Tue, 18 Feb 2025 10:41:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E5=BA=93=E7=AE=A1=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sgzb/base/api/domain/BackApplyInfo.java   | 10 +++++++
 .../service/impl/BackReceiveServiceImpl.java  | 27 +++++++++++++++----
 .../mapper/app/BackReceiveMapper.xml          | 11 +++++++-
 3 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BackApplyInfo.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BackApplyInfo.java
index f706c4cd..649e78c9 100644
--- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BackApplyInfo.java
+++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BackApplyInfo.java
@@ -238,4 +238,14 @@ public class BackApplyInfo {
 
     /** 操作后库存 */
     private int postStoreNum;
+
+    /**
+     * 库管id字符集
+     */
+    private String userId;
+
+    /**
+     * 库管id集合
+     */
+    private List<Long> userIds;
 }
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java
index 3467d14c..703391f0 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java
@@ -1,5 +1,6 @@
 package com.bonus.sgzb.app.service.impl;
 
+import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.bonus.sgzb.base.api.domain.BackApplyInfo;
 import com.bonus.sgzb.app.domain.TmTask;
 import com.bonus.sgzb.app.mapper.BackReceiveMapper;
@@ -17,10 +18,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author hay
@@ -61,8 +60,26 @@ public class BackReceiveServiceImpl implements BackReceiveService {
 
     @Override
     public List<BackApplyInfo> receiveView(BackApplyInfo record) {
+        Long userId = SecurityUtils.getUserId();
+        List<BackApplyInfo> list = new ArrayList<>();
+        List<Long> longs = new ArrayList<>();
         List<BackApplyInfo> backApplyInfoList = backReceiveMapper.receiveView(record);
-        return backApplyInfoList;
+        if (SecurityUtils.getLoginUser().getRoles().contains("admin")) {
+            return backApplyInfoList;
+        }
+        if (CollectionUtils.isNotEmpty(backApplyInfoList)) {
+            for (BackApplyInfo backApplyInfo : backApplyInfoList) {
+                if (StringUtils.isNotBlank(backApplyInfo.getUserId())) {
+                    List<String> strings = Arrays.asList(backApplyInfo.getUserId().split(","));
+                    //转换为long类型
+                    longs = strings.stream().map(Long::parseLong).collect(Collectors.toList());
+                }
+                if (longs.contains(userId)) {
+                    list.add(backApplyInfo);
+                }
+            }
+        }
+        return list;
     }
 
     public List<BackApplyInfo> receiveView2(BackApplyInfo record) {
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
index d0bc4741..346803a3 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
@@ -719,7 +719,8 @@
       bb.finished_back_num,
       mt.manage_type as manageType,
       mt.company_id as companyId,
-      CONCAT('NSJJ',mt.`code`,mt.model_code) as `code`
+      CONCAT('NSJJ',mt.`code`,mt.model_code) as `code`,
+      mtk.userId as userId
     FROM
       back_apply_details bad
         LEFT JOIN back_apply_info bai on bai.id=bad.parent_id
@@ -746,6 +747,14 @@
         parent_id=#{id} and is_finished = 1
         GROUP BY type_id
       ) bb on bb.typeId=bad.type_id
+    LEFT JOIN (
+    SELECT
+    type_id as typeId,
+    GROUP_CONCAT(user_id) as userId
+    FROM
+    ma_type_keeper
+    GROUP BY type_id
+    ) mtk ON mtk.typeId = bad.type_id
     WHERE
       bai.id=#{id}
       <if test="typeId != null and typeId != ''">