From d276b2f67315e638b6596b48da1b6f9ac01dd69b Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期六, 27 一月 2024 08:58:28 +0800
Subject: [PATCH] 	修改取水口查询ID类型

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
index d0a9b56..00deab6 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
@@ -245,14 +245,18 @@
     <!--鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇鐢ㄦ埛淇℃伅-->
     <select id="getUserInfoById" resultType="java.util.Map">
         SELECT
-            id AS userId,
-            name AS userName
-        FROM ba_user
+            us.id AS userId,
+            us.name AS userName,
+            us.phone,
+            IFNULL(us.blockId, 0) AS blockId,
+            IFNULL(blo.name, 0) AS blockName
+        FROM ba_user us
+            LEFT JOIN ba_block blo ON us.blockId = blo.id
         <where>
-            AND disabled = 0
-            AND deleted = 0
+            AND us.disabled = 0
+            AND us.deleted = 0
             <if test = "userId != null and userId > 0">
-                AND ba_user.id = ${userId}
+                AND us.id = ${userId}
             </if>
         </where>
     </select>

--
Gitblit v1.8.0