From 3ca213b4a1d46d916b478af9a7195924c3f8294d Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Thu, 23 Jan 2025 09:49:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../back/service/impl/BackApplyInfoServiceImpl.java |  5 ++++-
 .../material/scrap/ScrapApplyDetailsMapper.xml      | 13 +++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

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 b0df1868..6dfae5a0 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
@@ -161,7 +161,10 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService {
      * @param maCodeList
      */
     private void setMaCodeDetails(BackApplyDetails details, List<MaCodeVo> maCodeList) {
-        List<MaCodeVo> codeVos = maCodeList.stream().filter(maCodeVo -> StringUtils.isNotBlank(maCodeVo.getMaCode())).collect(Collectors.toList());
+        List<MaCodeVo> codeVos = maCodeList.stream()
+                .filter(maCodeVo -> StringUtils.isNotBlank(maCodeVo.getMaCode())
+                        && maCodeVo.getTypeId().equals(details.getTypeId().toString()))
+                .collect(Collectors.toList());
         List<MaCodeDto> maCodeDtos = new ArrayList<>();
         for (MaCodeVo maCodeVo : codeVos) {
             MaCodeDto maCodeDto = new MaCodeDto();
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapApplyDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapApplyDetailsMapper.xml
index 58e8d0cd..b638fdb5 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapApplyDetailsMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapApplyDetailsMapper.xml
@@ -79,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 tt.`code` like concat('%', #{keyWord}, '%') or
                 tt2.`code` like concat('%', #{keyWord}, '%') or
                 tt.remark like concat('%', #{keyWord}, '%') or
-                su.nick_name like concat('%', #{keyWord}, '%') or
+                su.nick_name like concat('%', #{keyWord}, '%')
                 )
             </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
@@ -128,7 +128,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                           when mt.manage_type = 1 then rar.type_id = ra.type_id
                           else false end)
         where
-            sad.task_id = #{taskId}
+        sad.task_id = #{taskId}
+        <if test="keyWord != null  and keyWord != ''">
+            and (
+            mt2.type_name like concat('%', #{keyWord}, '%') or
+            mt.type_name like concat('%', #{keyWord}, '%') or
+            mm.ma_code like concat('%', #{keyWord}, '%') or
+            su.nick_name like concat('%', #{keyWord}, '%') or
+            rar.scrap_reason like concat('%', #{keyWord}, '%')
+            )
+        </if>
         GROUP BY sad.id
         order by sad.create_time desc
     </select>