From 3222d83845148e2479af6aeb0f029def5f28f8b2 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 25 Mar 2024 12:34:53 +0800
Subject: [PATCH] Merge branch 'jc' of http://s16s652780.51mypc.cn:49896/r/zhba_management_w_bf into jc
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index 3297ad7..294407b 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -46,6 +46,7 @@
<result column="soil" property="soil"/>
<result column="reason_for_leav" property="reasonForLeav"/>
<result column="accreditationStatus" property="accreditationStatus"/>
+ <result column="ancestors" property="ancestors"/>
</resultMap>
<!--带坐标-->
@@ -58,6 +59,7 @@
bud.unit_name,
bud.permanent_residence_address as registered,
bd.dept_name,
+ bd.ancestors,
CASE WHEN sar.audit_status is not null THEN sar.audit_status ELSE -1 END AS accreditationStatus
from
blade_user bu
@@ -438,7 +440,7 @@
<!--通过 身份证号查询用户信息-->
<select id="getUserInfoByIdCardNo" resultType="org.springblade.modules.system.entity.User">
- SELECT id, name, real_name RealName,securitynumber,dept_id
+ SELECT id, name, real_name RealName,securitynumber,dept_id,dispatch
FROM blade_user
where 1=1
and is_deleted = 0
@@ -493,9 +495,9 @@
<if test="user.jurisdiction!=null and user.jurisdiction != ''">
and bu.jurisdiction = #{user.jurisdiction}
</if>
- <if test="user.unitName!=null and user.unitName != ''">
- and bud.unit_name like concat('%', #{user.unitName},'%')
- </if>
+<!-- <if test="user.unitName!=null and user.unitName != ''">-->
+<!-- and bud.unit_name like concat('%', #{user.unitName},'%')-->
+<!-- </if>-->
<if test="user.securitynumber!=null and user.securitynumber != ''">
and bu.securitynumber = #{user.securitynumber}
</if>
--
Gitblit v1.9.3