From 01233bc13663145957c9fcfce94b8eb87fee0714 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 25 Nov 2021 15:22:59 +0800
Subject: [PATCH] 派遣,考试,公司查询修改

---
 src/main/java/org/springblade/modules/social/mapper/SocialMapper.xml |   26 +++++++++++++++++++++-----
 1 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/springblade/modules/social/mapper/SocialMapper.xml b/src/main/java/org/springblade/modules/social/mapper/SocialMapper.xml
index 63c8736..b7a4897 100644
--- a/src/main/java/org/springblade/modules/social/mapper/SocialMapper.xml
+++ b/src/main/java/org/springblade/modules/social/mapper/SocialMapper.xml
@@ -24,21 +24,37 @@
     <select id="selectSocialPage" resultMap="socialResultMap">
         SELECT
         s.*,
+        distinct u.id,
         u.real_name as realname
         FROM
+        blade_user u
+        LEFT JOIN
         sys_socil s
-        LEFT JOIN blade_user u ON s.namb = u.id where 1=1
+        ON
+        s.cardid = u.cardid
+        left join
+        sys_jurisdiction sj
+        on
+        sj.id = s.jurisdiction
+        where 1=1
+        and u.is_deleted = 0
+        AND u.status = 1
+        and u.soil = 0
+        AND u.role_id = '1412226235153731586'
+        <if test="social.jurisdiction!=null and social.jurisdiction!='' and social.jurisdiction!='1372091709474910209'">
+            and (sj.id=#{social.jurisdiction} or sj.parent_id = #{social.jurisdiction})
+        </if>
         <if test="social.realname!=null and social.realname!=''">
             and u.real_name like concat(concat('%', #{social.realname}),'%')
         </if>
+        <if test="social.cardid!=null and social.cardid!=''">
+            and s.cardid like concat(concat('%', #{social.cardid}),'%')
+        </if>
         <if test="social.namb!=null and social.namb!=''">
-            and s.namb=#{social.namb}
+            and s.namb like concat('%',#{social.namb},'%')
         </if>
         <if test="social.deptid!=null and social.deptid!=''">
             and s.deptid=#{social.deptid}
-        </if>
-        <if test="social.jurisdiction!=null and social.jurisdiction!=''">
-            and s.jurisdiction=#{social.jurisdiction}
         </if>
     </select>
 

--
Gitblit v1.9.3