From d6670149331bbdeda4b0573927c13d36225a09c1 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 04 十二月 2023 15:52:08 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml |   36 +++++++++++++++++++++---------------
 1 files changed, 21 insertions(+), 15 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 efab302..e2c99bc 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
@@ -44,7 +44,7 @@
     </sql>
 
     <sql id="part_Column_List">
-        id, name, phone, orgTag, disabled
+        id, name, phone, disabled
     </sql>
 
     <sql id="Login_Column_List">
@@ -61,36 +61,36 @@
     <select id="selectTotal" parameterType="java.util.Map" resultType="java.lang.Long">
         select
         count(*)
-        from ba_user where supperAdmin!=1 and disabled!=1 and deleted!=1
+        from ba_user where supperAdmin!=1 and deleted!=1
         <trim prefix="and" suffixOverrides="and">
             <if test="name != null">
                 name like concat('%', #{name}, '%') and
             </if>
             <if test="phone != null">
-                phone = '#{phone,jdbcType=VARCHAR}'
+                phone = #{phone,jdbcType=VARCHAR}
             </if>
         </trim>
     </select>
     <select id="selectSome" parameterType="java.util.Map" resultMap="someResultMap">
         select
         <include refid="part_Column_List" />
-        from ba_user where supperAdmin!=1 and disabled!=1 and deleted!=1
+        from ba_user where supperAdmin!=1 and deleted!=1
         <trim prefix="and" suffixOverrides="and">
             <if test="name != null">
                 name like concat('%', #{name}, '%') and
             </if>
             <if test="phone != null">
-                phone = '#{phone,jdbcType=VARCHAR}'
+                phone = #{phone,jdbcType=VARCHAR}
             </if>
         </trim>
         order by id DESC
         <trim prefix="limit " >
             <if test="start != null and count != null">
-                #{start}, #{count}
+                #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
             </if>
         </trim>
     </select>
-    <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
+    <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
         insert into ba_user (<include refid="Base_Column_List" />)
         values (#{id,jdbcType=BIGINT},
         #{name,jdbcType=VARCHAR},
@@ -98,8 +98,8 @@
         #{password,jdbcType=VARCHAR},
         #{orgTag,jdbcType=VARCHAR},
         #{supperAdmin,jdbcType=TINYINT},
-        #{disabled,jdbcType=TINYINT},
-        #{deleted,jdbcType=TINYINT}
+        #{disabled,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
+        #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
         )
     </insert>
     <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
@@ -150,10 +150,10 @@
                 #{supperAdmin,jdbcType=TINYINT},
             </if>
             <if test="disabled != null">
-                #{disabled,jdbcType=TINYINT},
+                #{disabled,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
             </if>
             <if test="deleted != null">
-                #{deleted,jdbcType=TINYINT},
+                #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
             </if>
         </trim>
     </insert>
@@ -171,10 +171,10 @@
                 password = #{password,jdbcType=VARCHAR},
             </if>
             <if test="disabled != null">
-                disabled = #{disabled,jdbcType=TINYINT},
+                disabled = #{disabled,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
             </if>
             <if test="deleted != null">
-                deleted = #{deleted,jdbcType=TINYINT},
+                deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
             </if>
         </set>
         where id = #{id,jdbcType=BIGINT}
@@ -184,10 +184,16 @@
         set `name` = #{name,jdbcType=VARCHAR},
         phone = #{phone,jdbcType=VARCHAR},
         password = #{password,jdbcType=VARCHAR},
-        disabled = #{disabled,jdbcType=TINYINT},
-        deleted = #{deleted,jdbcType=TINYINT}
+        disabled = #{disabled,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
+        deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
         where id = #{id,jdbcType=BIGINT}
     </update>
+    <update id="changePassword" >
+        update ba_user
+        set password = #{password,jdbcType=VARCHAR}
+        where id = #{id,jdbcType=BIGINT}
+    </update>
+
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
         delete from ba_user
         where id = #{id,jdbcType=BIGINT}

--
Gitblit v1.8.0