From 349617384c7334699043e1f8a8a235c47f3a6b1c Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 14 八月 2026 16:51:47 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo

---
 ruoyi-project/src/main/resources/mapper/project/ServiceExternalpersonMapper.xml |   40 ++++++++++------------------------------
 1 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceExternalpersonMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceExternalpersonMapper.xml
index bda7727..89a9c29 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceExternalpersonMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceExternalpersonMapper.xml
@@ -28,34 +28,11 @@
         <result property="updateTime" column="update_time"/>
         <result property="pym" column="PYM"/>
         <result property="wbm" column="WBM"/>
-        <result property="unitTaxNo" column="UnitTaxNo"/>
+        <result property="unitTaxNo" column="unit_tax_no"/>
     </resultMap>
 
     <sql id="selectServiceExternalpersonVo">
-        select ID,
-               UserNo,
-               UnitTaxNo,
-               UserName,
-               UserStatus,
-               IDCardNo,
-               UserType,
-               PersonnelUnitNo,
-               Sex,
-               Telephone,
-               Address,
-               UnitNo,
-               UnitName,
-               Title,
-               DepositBank,
-               BranchBankName,
-               BankCardNo,
-               del_flag,
-               create_by,
-               create_time,
-               update_by,
-               update_time,
-               PYM,
-               WBM
+        select *
         from service_externalperson
     </sql>
 
@@ -63,6 +40,7 @@
             resultMap="ServiceExternalpersonResult">
         <include refid="selectServiceExternalpersonVo"/>
         <where>
+            service_externalperson.del_flag = 0
             <if test="userno != null  and userno != ''">and UserNo = #{userno}</if>
             <if test="username != null  and username != ''">and UserName like concat('%', #{username}, '%')</if>
             <if test="usertype != null  and usertype != ''">and UserType = #{usertype}</if>
@@ -75,19 +53,21 @@
             <if test="depositbank != null  and depositbank != ''">and DepositBank = #{depositbank}</if>
             <if test="branchbankname != null  and branchbankname != ''">and BranchBankName = #{branchbankname}</if>
             <if test="bankcardno != null  and bankcardno != ''">and BankCardNo = #{bankcardno}</if>
-            <if test="unitTaxNo != null  and unitTaxNo != ''">and UnitTaxNo = #{unitTaxNo}</if>
-
+            <if test="unitTaxNo != null  and unitTaxNo != ''">and unit_tax_no = #{unitTaxNo}</if>
         </where>
     </select>
 
     <select id="getAllpeople" resultType="com.ruoyi.project.domain.ServiceExternalperson">
         <include refid="selectServiceExternalpersonVo"/>
-        where UserType = #{usertype}
+        where service_externalperson.del_flag = 0 and UserType = #{usertype}
     </select>
     <select id="getInfoByUserNo" resultType="com.ruoyi.project.domain.ServiceExternalperson">
         <include refid="selectServiceExternalpersonVo"/>
-        where UserNo = #{userno}
+        where del_flag = 0 and UserNo = #{userno}
     </select>
 
-
+    <select id="getInfoByIDCardNo" resultType="com.ruoyi.project.domain.ServiceExternalperson">
+        <include refid="selectServiceExternalpersonVo"/>
+        where del_flag = 0 and idcardno = #{idcardno}
+    </select>
 </mapper>

--
Gitblit v1.9.3