From 7caf1072c6cff4e21a52af6d1f9e9fcfa22c07e2 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 27 五月 2025 10:33:36 +0800
Subject: [PATCH] 生成登录验证码改为随机数

---
 pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml |   41 ++++++++++++++++++++++++++++-------------
 1 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
index 8a3fdc4..7ac0faa 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
@@ -84,6 +84,13 @@
     where disabled!=1 and deleted!=1 and phone=#{phone} and password=#{password}
   </select>
 
+  <select id="getUserList" resultMap="loginResultMap" >
+    select
+    <include refid="Login_Column_List" />
+    from ba_user
+    where disabled!=1 and deleted!=1
+  </select>
+
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="oneResultMap">
     <!--@mbg.generated-->
     select 
@@ -108,7 +115,7 @@
 <!--      <if test="roleId != null and roleId !=''">-->
 <!--        ur.role_id=#{roleId,jdbcType=BIGINT} and-->
 <!--      </if>-->
-      <if test="disabled != null and disabled !=''">
+      <if test="disabled != null">
         bu.disabled=#{disabled,jdbcType=BOOLEAN}
       </if>
     </trim>
@@ -129,7 +136,7 @@
 <!--      <if test="roleId != null and roleId !=''">-->
 <!--        ur.role_id=#{roleId,jdbcType=BIGINT} and-->
 <!--      </if>-->
-      <if test="disabled != null and disabled !=''">
+      <if test="disabled != null">
         bu.disabled=#{disabled,jdbcType=BOOLEAN}
       </if>
     </trim>
@@ -140,6 +147,14 @@
       </if>
     </trim>
   </select>
+  <select id="selectAll" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from ba_user
+    where supper_admin!=1 and deleted!=1 and disabled!=1
+    order by id ASC
+  </select>
+
   <select id="selectNamesByAssistants" parameterType="java.lang.String" resultType="java.lang.String">
     SELECT GROUP_CONCAT(name) AS assistantNames FROM ba_user WHERE id IN
     <if test="assistants != null and assistants !=''">
@@ -170,7 +185,7 @@
     <!--@mbg.generated-->
     insert into ba_user
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null and id !=''">
+      <if test="id != null">
         id,
       </if>
       <if test="name != null and name !=''">
@@ -182,18 +197,18 @@
       <if test="password!= null and password !=''">
         `password`,
       </if>
-      <if test="supperAdmin!= null and supperAdmin !=''">
+      <if test="supperAdmin!= null">
         supper_admin,
       </if>
-      <if test="disabled != null and disabled !=''">
+      <if test="disabled != null">
         disabled,
       </if>
-      <if test="deleted != null and deleted !=''">
+      <if test="deleted != null">
         deleted,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null and id !=''">
+      <if test="id != null">
         #{id},
       </if>
       <if test="name != null and name !=''">
@@ -205,13 +220,13 @@
       <if test="password!= null and password !=''">
         #{password},
       </if>
-      <if test="supperAdmin!= null and supperAdmin !=''">
+      <if test="supperAdmin!= null">
         #{supperAdmin},
       </if>
-      <if test="disabled != null and disabled !=''">
+      <if test="disabled != null">
         #{disabled},
       </if>
-      <if test="deleted != null and deleted !=''">
+      <if test="deleted != null">
         #{deleted},
       </if>
     </trim>
@@ -229,13 +244,13 @@
       <if test="password!= null and password !=''">
         `password` = #{password},
       </if>
-      <if test="supperAdmin!= null and supperAdmin !=''">
+      <if test="supperAdmin!= null">
         supper_admin = #{supperAdmin},
       </if>
-      <if test="disabled != null and disabled !=''">
+      <if test="disabled != null">
         disabled = #{disabled},
       </if>
-      <if test="deleted != null and deleted !=''">
+      <if test="deleted != null">
         deleted = #{deleted},
       </if>
     </set>

--
Gitblit v1.8.0