From 4289137c3e7990f8a91b5437915a2b804c00aeb3 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 16 Sep 2021 08:54:19 +0800
Subject: [PATCH] 1.社保

---
 src/main/java/org/springblade/modules/social/mapper/SocialMapper.xml |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 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 5e8cb30..627035e 100644
--- a/src/main/java/org/springblade/modules/social/mapper/SocialMapper.xml
+++ b/src/main/java/org/springblade/modules/social/mapper/SocialMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.modules.social.mapper.SocialMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="socialResultMap" type="org.springblade.modules.social.entity.Social">
+    <resultMap id="socialResultMap" type="org.springblade.modules.social.vo.SocialVO">
         <id column="id" property="id"/>
         <result column="namb" property="namb"/>
         <result column="sex" property="sex"/>
@@ -17,11 +17,26 @@
         <result column="amount" property="amount"/>
         <result column="insuredtime" property="insuredtime"/>
         <result column="deptid" property="deptid"/>
+        <result column="jurisdiction" property="jurisdiction"/>
     </resultMap>
 
 
     <select id="selectSocialPage" resultMap="socialResultMap">
-        select * from sys_social
+        SELECT
+        s.*,
+        u.real_name as realname
+        FROM
+        sys_socil s
+        LEFT JOIN blade_user u ON s.namb = u.id where 1=1
+        <if test="social.namb!=null and social.namb!=''">
+            and s.namb=#{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>
 
     <update id="upSoil">

--
Gitblit v1.9.3