From 74797e8d62e93b62f738ecf610cf87b600616182 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Thu, 27 Mar 2025 14:04:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/service/impl/BackReceiveServiceImpl.java     | 12 ++++++++++--
 .../mapper/material/StorageStatusMapper.xml          |  2 +-
 .../resources/mapper/system/BmStorageLogMapper.xml   |  1 +
 3 files changed, 12 insertions(+), 3 deletions(-)

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 14cd8a4a..67abccbc 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
@@ -44,7 +44,11 @@ public class BackReceiveServiceImpl implements BackReceiveService {
     @Override
     public List<BackApplyInfo> getbackReceiveList(BackApplyInfo record) {
         List<BackApplyInfo> backApplyInfoList = backReceiveMapper.getbackReceiveList(record);
-        if (SecurityUtils.getLoginUser().getRoles().contains("admin")) {
+        // 定义需要匹配的角色集合
+        List<String> allowedRoles = Arrays.asList("admin", "em01", "em02", "jjbz", "dm01", "dm07");
+        // 获取当前用户的角色集合
+        Set<String> userRoles = SecurityUtils.getLoginUser().getRoles();
+        if (userRoles != null && allowedRoles.stream().anyMatch(userRoles::contains)) {
             return backApplyInfoList;
         }
         List<BackApplyInfo> backApplyInfos = new ArrayList<>();
@@ -85,7 +89,11 @@ public class BackReceiveServiceImpl implements BackReceiveService {
         List<BackApplyInfo> list = new ArrayList<>();
         List<Long> longs = new ArrayList<>();
         List<BackApplyInfo> backApplyInfoList = backReceiveMapper.receiveView(record);
-        if (SecurityUtils.getLoginUser().getRoles().contains("admin")) {
+        // 定义需要匹配的角色集合
+        List<String> allowedRoles = Arrays.asList("admin", "em01", "em02", "jjbz", "dm01", "dm07");
+        // 获取当前用户的角色集合
+        Set<String> userRoles = SecurityUtils.getLoginUser().getRoles();
+        if (userRoles != null && allowedRoles.stream().anyMatch(userRoles::contains)) {
             return backApplyInfoList;
         }
         if (CollectionUtils.isNotEmpty(backApplyInfoList)) {
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml
index d5eeea1e..3a37e2b1 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml
@@ -87,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN ma_type mt ON mt.type_id = bcd.type_id
         LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
         LEFT JOIN ma_machine mm ON mm.ma_id = bcd.ma_id
-        where (bcd.status = '1' or bcd.status is null)
+        WHERE bcd.is_finished IS NOT NULL and bcd.is_finished = '1'
         GROUP BY
         mt.type_id
         ) AS subquery2 ON subquery1.type_id = subquery2.type_id
diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmStorageLogMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmStorageLogMapper.xml
index 95333f47..b650e02b 100644
--- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmStorageLogMapper.xml
+++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmStorageLogMapper.xml
@@ -65,6 +65,7 @@
         and mt1.type_name like concat('%', #{typeName}, '%')
       </if>
     </where>
+    order by bsl.create_time desc
   </select>
 
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">