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 |   46 ++++++++++++++++++++++++++++++----------------
 1 files changed, 30 insertions(+), 16 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 9ebda5d..7ac0faa 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
@@ -76,13 +76,19 @@
     select
       count(*)
     from ba_user
-    where  deleted!=1
   </select>
   <select id="login" resultMap="loginResultMap" >
     select
     <include refid="Login_Column_List" />
     from ba_user
     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">
@@ -106,7 +112,7 @@
       <if test="phone != null and phone !=''">
         bu.phone = #{phone,jdbcType=VARCHAR} and
       </if>
-<!--      <if test="roleId != null">-->
+<!--      <if test="roleId != null and roleId !=''">-->
 <!--        ur.role_id=#{roleId,jdbcType=BIGINT} and-->
 <!--      </if>-->
       <if test="disabled != null">
@@ -127,7 +133,7 @@
       <if test="phone != null and phone !=''">
         bu.phone = #{phone,jdbcType=VARCHAR} and
       </if>
-<!--      <if test="roleId != null">-->
+<!--      <if test="roleId != null and roleId !=''">-->
 <!--        ur.role_id=#{roleId,jdbcType=BIGINT} and-->
 <!--      </if>-->
       <if test="disabled != null">
@@ -141,9 +147,17 @@
       </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">
+    <if test="assistants != null and assistants !=''">
       <foreach collection="assistants.split(',')" item="item" separator="," open="(" close=")">
         #{item,jdbcType=BIGINT}
       </foreach>
@@ -174,16 +188,16 @@
       <if test="id != null">
         id,
       </if>
-      <if test="name != null">
+      <if test="name != null and name !=''">
         `name`,
       </if>
-      <if test="phone != null">
+      <if test="phone!= null and phone !=''">
         phone,
       </if>
-      <if test="password != null">
+      <if test="password!= null and password !=''">
         `password`,
       </if>
-      <if test="supperAdmin != null">
+      <if test="supperAdmin!= null">
         supper_admin,
       </if>
       <if test="disabled != null">
@@ -197,16 +211,16 @@
       <if test="id != null">
         #{id},
       </if>
-      <if test="name != null">
+      <if test="name != null and name !=''">
         #{name},
       </if>
-      <if test="phone != null">
+      <if test="phone!= null and phone !=''">
         #{phone},
       </if>
-      <if test="password != null">
+      <if test="password!= null and password !=''">
         #{password},
       </if>
-      <if test="supperAdmin != null">
+      <if test="supperAdmin!= null">
         #{supperAdmin},
       </if>
       <if test="disabled != null">
@@ -221,16 +235,16 @@
     <!--@mbg.generated-->
     update ba_user
     <set>
-      <if test="name != null">
+      <if test="name != null and name !=''">
         `name` = #{name},
       </if>
-      <if test="phone != null">
+      <if test="phone!= null and phone !=''">
         phone = #{phone},
       </if>
-      <if test="password != null">
+      <if test="password!= null and password !=''">
         `password` = #{password},
       </if>
-      <if test="supperAdmin != null">
+      <if test="supperAdmin!= null">
         supper_admin = #{supperAdmin},
       </if>
       <if test="disabled != null">

--
Gitblit v1.8.0