From ae940502b8431e4773d030bc9cb2d05f0ec6cecf Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 10 五月 2023 21:22:51 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo

---
 ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
index c708c95..b5de3ab 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
@@ -87,6 +87,9 @@
         <result property="infophone"    column="infoPhone"    />
         <result property="deptid"    column="deptid"    />
         <result property="deptname"    column="deptname"    />
+        <result property="leaderno"    column="leaderno"    />
+        <result property="leadername"    column="leadername"    />
+        <result property="businessarea"    column="businessarea"    />
 
     </resultMap>
 
@@ -180,6 +183,9 @@
             <if test="city != null and city != ''"> and `base_organization`.`City` = #{city}</if>
             <if test="deptid != null "> and deptid = #{deptid}</if>
             <if test="deptname != null "> and deptname = #{deptname}</if>
+            <if test="leaderno != null "> and leaderno = #{leaderno}</if>
+            <if test="leadername != null "> and leadername = #{leadername}</if>
+            <if test="businessarea != null "> and businessarea = #{businessarea}</if>
         </where>
 
         order by ReportTime desc

--
Gitblit v1.9.3