From 5b207a55bdd10f1516031f629217daac069b64fd Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期五, 30 八月 2024 11:40:31 +0800
Subject: [PATCH] 添加免登录查询所有排班接口;

---
 pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml |   48 ++++++++++++++++++++++++++----------------------
 1 files changed, 26 insertions(+), 22 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 64e3777..d128a39 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
@@ -40,9 +40,9 @@
     <!--@mbg.generated-->
     id, `name`, phone, `password`, supper_admin, disabled, deleted, create_dt
   </sql>
-  <sql id="part_Column_List">
-    ${alias}.id, ${alias}.name, ${alias}.phone, ${alias}.password, ${alias}.disabled,${alias}.create_dt
-  </sql>
+<!--  <sql id="part_Column_List"><![CDATA[-->
+<!--    ${alias}.id, ${alias}.name, ${alias}.phone, ${alias}.password, ${alias}.disabled,${alias}.create_dt-->
+<!--  ]]></sql>-->
   <sql id="Login_Column_List">
     id, name, phone, supper_admin
   </sql>
@@ -76,13 +76,19 @@
     select
       count(*)
     from ba_user
-    where supper_admin!=1 and 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">
@@ -116,9 +122,7 @@
   </select>
   <select id="selectSome" parameterType="java.util.Map" resultMap="someResultMap">
     select
-    <include refid="part_Column_List" >
-      <property name="alias" value="bu"/>
-    </include>
+    <include refid="Base_Column_List"/>
     from ba_user bu
 #     left join ba_user_role ur on ur.user_id=bu.id
     where bu.supper_admin!=1 and bu.deleted!=1
@@ -129,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">
@@ -145,7 +149,7 @@
   </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>
@@ -176,16 +180,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 and supperAdmin !=''">
         supper_admin,
       </if>
       <if test="disabled != null">
@@ -199,16 +203,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 and supperAdmin !=''">
         #{supperAdmin},
       </if>
       <if test="disabled != null">
@@ -223,16 +227,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 and supperAdmin !=''">
         supper_admin = #{supperAdmin},
       </if>
       <if test="disabled != null">

--
Gitblit v1.8.0