From 3413151b3bc4894110a34504a2359a528eb4aae9 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 09 Aug 2021 15:57:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 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 1ec2f77..e7bd303 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -40,6 +40,7 @@
<result column="jurisdiction" property="jurisdiction"/>
<result column="securitynumber" property="securitynumber"/>
<result column="dispatch" property="dispatch"/>
+ <result column="my_picture" property="myPicture"/>
<result column="deptname" property="deptname"/>
</resultMap>
@@ -81,7 +82,7 @@
<if test="user.status!=null and user.status != ''">
and bu.status = #{user.status}
</if>
- <if test="user.jurisdiction!=null and user.jurisdiction != ''">
+ <if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction!='1123598813738675201'">
and bu.jurisdiction = #{user.jurisdiction}
</if>
<if test="user.realName!=null and user.realName != ''">
--
Gitblit v1.9.3