From daef9edffb73d542ff1eba4beb215ffc7b306254 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 28 Dec 2023 18:44:46 +0800
Subject: [PATCH] bug 修复

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml |   63 +++++++++++++++++++++++++++++++
 1 files changed, 63 insertions(+), 0 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 df0e6fd..0c17a3d 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -42,6 +42,9 @@
         <if test="user.realName!=null and user.realName != ''">
             and real_name like concat('%',#{user.realName},'%')
         </if>
+        <if test="user.name!=null and user.name != ''">
+            and name like concat('%',#{user.name},'%')
+        </if>
         <if test="user.userType!=null and user.userType != ''">
             and user_type = #{user.userType}
         </if>
@@ -83,4 +86,64 @@
         </if>
     </select>
 
+    <select id="searchUserByDistrictId" resultType="org.springblade.modules.system.entity.User">
+        SELECT
+            bu.*
+        FROM
+            blade_user bu
+                LEFT JOIN jczz_household jh ON bu.id = jh.associated_user_id
+                LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jh.house_code
+                LEFT JOIN jczz_district jd on jd.aoi_code=jda.aoi_code
+        WHERE
+            jd.id  = #{districtId}
+          and bu.is_deleted = '0'
+          and jh.is_deleted = '0'
+
+    </select>
+
+    <!--根据手机号查询对应账号和手机号的用户信息-->
+    <select id="getUserListByPhoneOrAccount" resultType="org.springblade.modules.system.entity.User">
+        SELECT * FROM blade_user where is_deleted = 0
+        and (account = #{phoneNumber} or phone = #{phoneNumber})
+    </select>
+
+    <!--用户详情接口-->
+    <select id="getUserInfo" resultType="org.springblade.modules.system.vo.UserDetailVO">
+        SELECT * FROM blade_user where is_deleted = 0
+        and id = #{userId}
+    </select>
+
+
+    <select id="searchUserById" resultType="org.springblade.modules.system.vo.UserVO">
+       select
+	        id userId,
+	        tenant_id,
+	        code,
+	        user_type,
+	        account,
+	        name,
+	        real_name,
+	        avatar,
+	        email,
+	        phone,
+	        birthday,
+	        sex,
+	        role_id,
+	        dept_id,
+	        post_id,
+	        create_user,
+	        create_dept,
+	        create_time,
+	        update_user,
+	        update_time,
+	        status,
+	        is_deleted
+		from
+        	blade_user
+        where
+        id = #{id}
+    </select>
+
+
+
 </mapper>

--
Gitblit v1.9.3