From fa6d7d58b8fc7c8ed61371323fbca1b6d32be95b Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Tue, 15 Jul 2025 10:06:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E6=96=99=E7=AB=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/clz/service/impl/BmTeamServiceImpl.java   |  7 +++++++
 .../com/bonus/material/common/mapper/SelectMapper.java |  7 +++++++
 .../common/service/impl/SelectServiceImpl.java         |  2 +-
 .../resources/mapper/material/clz/BmTeamMapper.xml     |  2 +-
 .../resources/mapper/material/common/SelectMapper.xml  | 10 +++++++++-
 5 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/BmTeamServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/BmTeamServiceImpl.java
index 2a736eab..cb0f0f74 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/BmTeamServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/BmTeamServiceImpl.java
@@ -2,6 +2,7 @@ package com.bonus.material.clz.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.PhoneUtil;
+import com.bonus.common.biz.constant.MaterialConstants;
 import com.bonus.common.biz.enums.HttpCodeEnum;
 import com.bonus.common.core.utils.StringUtils;
 import com.bonus.common.core.utils.encryption.Sm4Utils;
@@ -154,6 +155,12 @@ public class BmTeamServiceImpl implements BmTeamService {
      */
     @Override
     public AjaxResult getListByIdCard(BmTeam tbTeam) {
+        if (StringUtils.isNotBlank(tbTeam.getIdCard())) {
+            // 校验身份证号是否符合正则格式
+            if (!tbTeam.getIdCard().matches(MaterialConstants.CREDENTIALS_CODE_PATTERN)) {
+                tbTeam.setIdCard(null);
+            }
+        }
         return AjaxResult.success(bmTeamMapper.queryByPage(tbTeam));
     }
 
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/mapper/SelectMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/mapper/SelectMapper.java
index d4d6ba02..63371e04 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/mapper/SelectMapper.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/mapper/SelectMapper.java
@@ -250,4 +250,11 @@ public interface SelectMapper {
      * @return
      */
     List<String> getProjectId(String departId);
+
+    /**
+     * 获取材料站退料往来单位id和标段工程id获取协议信息
+     * @param dto
+     * @return
+     */
+    List<AgreementVo> getAgreementInfoByIdBack(SelectDto dto);
 }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java
index 109e5c21..2a004e29 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java
@@ -274,7 +274,7 @@ public class SelectServiceImpl implements SelectService {
             if (dto != null  && dto.getTeamId() != null) {
                 dto.setUnitId(Integer.parseInt(dto.getTeamId()));
             }
-            List<AgreementVo> list = mapper.getAgreementInfoById(dto);
+            List<AgreementVo> list = mapper.getAgreementInfoByIdBack(dto);
             if (CollectionUtils.isNotEmpty(list)) {
                 vo = list.get(0);
             }
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/BmTeamMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/BmTeamMapper.xml
index db535fd2..421752de 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/BmTeamMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/BmTeamMapper.xml
@@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="createUser != null">
             and t.create_by = #{createUser}
         </if>
-        <if test="idCard != null">
+        <if test="idCard != null and idCard != ''">
             and t.bzz_idcard = #{idCard}
         </if>
         <if test="keyWord != null and keyWord != ''">
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml
index cacedcc3..f72b651f 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml
@@ -190,7 +190,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT agreement_id AS agreementId,
                agreement_code AS agreementCode,
                is_slt AS isSlt
-        FROM clz_bm_agreement_info
+        FROM bm_agreement_info
         WHERE unit_id = #{unitId} AND project_id = #{projectId} AND status = '1'
     </select>
 
@@ -576,4 +576,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND project_dept_id = #{departId}
           </if>
     </select>
+
+    <select id="getAgreementInfoByIdBack" resultType="com.bonus.material.common.domain.vo.AgreementVo">
+        SELECT agreement_id AS agreementId,
+               agreement_code AS agreementCode,
+               is_slt AS isSlt
+        FROM clz_bm_agreement_info
+        WHERE unit_id = #{unitId} AND project_id = #{projectId} AND status = '1'
+    </select>
 </mapper>