From f1599d8230e83fb08ebb0473bbe486979b4d1d38 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 29 五月 2024 17:24:16 +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 |   35 +++++++++++++++++++----------------
 1 files changed, 19 insertions(+), 16 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 ccf499f..3b273b9 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
@@ -6,21 +6,23 @@
     <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaUser">
         <!--@mbg.generated-->
         <!--@Table ba_user-->
-        <id property="userId" column="id" />
+        <id property="id" column="id" />
         <result property="blockId" column="blockId"/>
         <result property="userName" column="name"/>
         <result property="phone" column="phone"/>
         <result property="password" column="password"/>
         <result property="orgTag" column="orgTag"/>
         <result property="supperAdmin" column="supperAdmin"/>
-        <result property="disabled" column="disabled" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Disabled"/>
-        <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Deleted"/>
+        <result property="disabled" column="disabled" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler"
+                javaType="com.dy.common.mybatis.envm.Disabled"/>
+        <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler"
+                javaType="com.dy.common.mybatis.envm.Deleted"/>
     </resultMap>
 
     <resultMap id="partResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaUser">
         <!--@mbg.generated-->
         <!--@Table ba_user-->
-        <id property="userId" column="id" />
+        <id property="id" column="id" />
         <result property="userName" column="name"/>
         <result property="phone" column="phone"/>
         <result property="orgTag" column="orgTag"/>
@@ -29,7 +31,7 @@
     </resultMap>
 
     <resultMap id="loginResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaUser">
-        <id property="userId" column="id" />
+        <id property="id" column="id" />
         <result property="blockId" column="blockId"/>
         <result property="userName" column="name"/>
         <result property="phone" column="phone"/>
@@ -99,8 +101,9 @@
         </trim>
     </select>
     <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
-        insert into ba_user (<include refid="Base_Column_List" />)
-        values (#{userId,jdbcType=BIGINT},
+<!--        insert into ba_user (<include refid="Base_Column_List" />)-->
+        insert into ba_user(id, blockId, name, phone, password, orgTag, supperAdmin, disabled, deleted)
+        values (#{id,jdbcType=BIGINT},
         #{blockId,jdbcType=BIGINT},
         #{userName,jdbcType=VARCHAR},
         #{phone,jdbcType=VARCHAR},
@@ -114,7 +117,7 @@
     <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
         insert into ba_user
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="userId != null">
+            <if test="id != null">
                 id,
             </if>
             <if test="blockId != null">
@@ -143,8 +146,8 @@
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="userId != null">
-                #{userId,jdbcType=BIGINT},
+            <if test="id != null">
+                #{id,jdbcType=BIGINT},
             </if>
             <if test="blockId != null">
                 #{blockId,jdbcType=BIGINT},
@@ -195,7 +198,7 @@
                 deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
             </if>
         </set>
-        where id = #{userId, jdbcType=BIGINT}
+        where id = #{id, jdbcType=BIGINT}
     </update>
     <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
         update ba_user
@@ -205,7 +208,7 @@
         password = #{password,jdbcType=VARCHAR},
         disabled = #{disabled,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
         deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
-        where id = #{userId,jdbcType=BIGINT}
+        where id = #{id,jdbcType=BIGINT}
     </update>
     <update id="changePassword" >
         update ba_user
@@ -271,8 +274,8 @@
             AND user.supperAdmin != 1
             AND user.deleted = 0
 
-            <if test = "name != null and name !=''">
-                AND user.name like CONCAT('%',#{name},'%')
+            <if test = "userName != null and userName !=''">
+                AND user.name like CONCAT('%',#{userName},'%')
             </if>
 
             <if test = "phone != null and phone !=''">
@@ -304,8 +307,8 @@
             AND user.supperAdmin != 1
             AND user.deleted = 0
 
-            <if test = "name != null and name !=''">
-                AND user.name like CONCAT('%',#{name},'%')
+            <if test = "userName != null and userName !=''">
+                AND user.name like CONCAT('%',#{userName},'%')
             </if>
 
             <if test = "phone != null and phone !=''">

--
Gitblit v1.8.0