From 29807fea73899a5b775eb2c7d8e1c05ea8bc0c3d Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 02 八月 2024 17:00:31 +0800
Subject: [PATCH] 2024-08-02 朱宝民 优化获取全部取水口接口，包含经纬度及12小时之内的报警信息
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 3b273b9..a07541e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
@@ -269,7 +269,7 @@
SELECT
COUNT(*) AS recordCount
FROM ba_user user
- INNER JOIN ba_user_role usro ON usro.userId = user.id
+<!-- INNER JOIN ba_user_role usro ON usro.userId = user.id-->
<where>
AND user.supperAdmin != 1
AND user.deleted = 0
@@ -291,7 +291,7 @@
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鐢ㄦ埛鍒楄〃-->
<select id="getUsers" resultType="com.dy.pipIrrGlobal.voBa.VoUserInfo">
SELECT
- CAST(id AS char) AS userId,
+ CAST(id AS char) AS id,
phone,
name AS userName,
disabled AS stateId,
@@ -302,7 +302,7 @@
CAST(blockId AS char) AS blockId,
(SELECT name FROM ba_block WHERE id = user.blockId) AS blockName
FROM ba_user user
- INNER JOIN ba_user_role usro ON usro.userId = user.id
+<!-- INNER JOIN ba_user_role usro ON usro.userId = user.id-->
<where>
AND user.supperAdmin != 1
AND user.deleted = 0
@@ -343,4 +343,12 @@
WHERE userId = ${userId}
</select>
+
+ <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ <!--@mbg.generated-->
+ select
+ <include refid="Base_Column_List" />
+ from ba_user
+ where id = #{id,jdbcType=BIGINT}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0