From 1ffdd87a0a34c9428ba1fe6acf56811f791f6f27 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 30 十月 2024 11:16:07 +0800
Subject: [PATCH] 2024-10-30 农户问题上报添加接口

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml |   61 ++++++++++++++++++++++++------
 1 files changed, 49 insertions(+), 12 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..b8f7e0d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
@@ -48,7 +48,7 @@
     </sql>
 
     <sql id="part_Column_List">
-        ${alias}.id, ${alias}.name, ${alias}.phone, ${alias}.disabled
+        #{alias}.id, #{alias}.name, #{alias}.phone, #{alias}.disabled
     </sql>
 
     <sql id="Login_Column_List">
@@ -240,7 +240,7 @@
             INNER JOIN ba_role_permissions per ON per.roleId = rol.id
         <where>
             <if test = "userId != null and userId > 0">
-                AND user.id = ${userId}
+                AND user.id = #{userId}
             </if>
         </where>
     </select>
@@ -259,7 +259,7 @@
             AND us.disabled = 0
             AND us.deleted = 0
             <if test = "userId != null and userId > 0">
-                AND us.id = ${userId}
+                AND us.id = #{userId}
             </if>
         </where>
     </select>
@@ -268,8 +268,21 @@
     <select id="getRecordCount" parameterType="java.util.Map" resultType="java.lang.Long">
         SELECT
             COUNT(*) AS recordCount
+        FROM
+        (
+        SELECT
+        CAST(id AS char) AS id,
+        phone,
+        name AS userName,
+        disabled AS stateId,
+        (CASE
+        WHEN disabled = 0 THEN '姝ｅ父'
+        WHEN disabled = 1 THEN '宸茬鐢�'
+        END) AS stateName,
+        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
+        LEFT JOIN ba_user_role usro ON usro.userId = user.id
         <where>
             AND user.supperAdmin != 1
             AND user.deleted = 0
@@ -283,26 +296,27 @@
             </if>
 
             <if test = "roleId != null and roleId > 0">
-                AND usro.roleId = ${roleId}
+                AND usro.roleId = #{roleId}
             </if>
         </where>
+        GROUP BY user.id) c
     </select>
 
     <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鐢ㄦ埛鍒楄〃-->
     <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,
             (CASE
-                 WHEN disabled = 0 THEN "姝ｅ父"
-                 WHEN disabled = 1 THEN "宸茬鐢�"
+                 WHEN disabled = 0 THEN '姝ｅ父'
+                 WHEN disabled = 1 THEN '宸茬鐢�'
                 END) AS stateName,
             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
+            LEFT JOIN ba_user_role usro ON usro.userId = user.id
         <where>
             AND user.supperAdmin != 1
             AND user.deleted = 0
@@ -316,9 +330,10 @@
             </if>
 
             <if test = "roleId != null and roleId > 0">
-                AND usro.roleId = ${roleId}
+                AND usro.roleId = #{roleId}
             </if>
         </where>
+        GROUP BY user.id
         ORDER BY user.id DESC
         <trim prefix="limit " >
             <if test="start != null and count != null">
@@ -332,7 +347,7 @@
         SELECT
             roleId
         FROM ba_user_role
-        WHERE userId = ${userId}
+        WHERE userId = #{userId}
     </select>
 
     <select id="getRoleNamesByUserId" resultType="java.util.HashMap">
@@ -340,7 +355,29 @@
             ro.name AS roleName
         FROM ba_user_role usro
                  INNER JOIN ba_role ro ON usro.roleId = ro.id
-        WHERE userId = ${userId}
+        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>
+
+    <select id="getPhones" resultType="java.lang.String">
+        SELECT phone FROM ba_user WHERE deleted = 0 and disabled = 0
+    </select>
+
+    <!--鑾峰彇绠�鍗曠敤鎴锋暟鎹垪琛�-->
+    <select id="getSimpleUsers" resultType="com.dy.pipIrrGlobal.voBa.VoSimpleUser">
+        SELECT
+            id AS userId,
+            name AS userName
+        FROM  ba_user
+        WHERE disabled = 0 AND deleted = 0
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0