Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

Administrator

2024-01-16 3d45d7d912b437bc1e281acc32fb313bee5dae1e

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml

@@ -7,6 +7,7 @@
        <!--@mbg.generated-->
        <!--@Table ba_user-->
        <id property="id" column="id" />
        <result property="blockId" column="blockId"/>
        <result property="name" column="name"/>
        <result property="phone" column="phone"/>
        <result property="password" column="password"/>
@@ -29,6 +30,7 @@

    <resultMap id="loginResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaUser">
        <id property="id" column="id" />
        <result property="blockId" column="blockId"/>
        <result property="name" column="name"/>
        <result property="phone" column="phone"/>
        <result property="orgTag" column="orgTag"/>
@@ -40,15 +42,15 @@
    </resultMap>

    <sql id="Base_Column_List">
        id, name, phone, password, orgTag, supperAdmin, disabled, deleted
        id, blockId, name, phone, password, orgTag, supperAdmin, disabled, deleted
    </sql>

    <sql id="part_Column_List">
        id, name, phone, disabled
        ${alias}.id, ${alias}.name, ${alias}.phone, ${alias}.disabled
    </sql>

    <sql id="Login_Column_List">
        id, name, phone, orgTag, supperAdmin
        id, blockId, name, phone, orgTag, supperAdmin
    </sql>

    <select id="login" resultMap="loginResultMap" >
@@ -61,45 +63,52 @@
    <select id="selectTotal" parameterType="java.util.Map" resultType="java.lang.Long">
        select
        count(*)
        from ba_user where supperAdmin!=1 and deleted!=1
        from ba_user
        where supperAdmin!=1 and deleted!=1
        <trim prefix="and" suffixOverrides="and">
            <if test="name != null">
            <if test="name != null and name != ''">
                name like concat('%', #{name}, '%') and
            </if>
            <if test="phone != null">
                phone = '#{phone,jdbcType=VARCHAR}'
            <if test="phone != null and phone !=''">
                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 deleted!=1
        <include refid="part_Column_List" >
            <property name="alias" value="bu"/>
        </include>,
        bb.`name` blockName
        from ba_user bu
        left join ba_block bb on bu.blockId = bb.id
        where bu.supperAdmin!=1 and bu.deleted!=1
        <trim prefix="and" suffixOverrides="and">
            <if test="name != null">
                name like concat('%', #{name}, '%') and
            <if test="name != null and name != ''">
                bu.name like concat('%', #{name}, '%') and
            </if>
            <if test="phone != null">
                phone = '#{phone,jdbcType=VARCHAR}'
            <if test="phone != null and phone !=''">
                bu.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},
        #{blockId,jdbcType=BIGINT},
        #{name,jdbcType=VARCHAR},
        #{phone,jdbcType=VARCHAR},
        #{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">
@@ -108,7 +117,10 @@
            <if test="id != null">
                id,
            </if>
            <if test="name != null">
            <if test="blockId != null">
                blockId,
            </if>
           <if test="name != null">
                `name`,
            </if>
            <if test="phone != null">
@@ -134,7 +146,10 @@
            <if test="id != null">
                #{id,jdbcType=BIGINT},
            </if>
            <if test="name != null">
            <if test="blockId != null">
                #{blockId,jdbcType=BIGINT},
            </if>
           <if test="name != null">
                #{name,jdbcType=VARCHAR},
            </if>
            <if test="phone != null">
@@ -150,10 +165,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>
@@ -161,7 +176,10 @@
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
        update ba_user
        <set>
            <if test="name != null">
            <if test="blockId != null">
                blockId = #{blockId,jdbcType=BIGINT},
            </if>
           <if test="name != null">
                `name` = #{name,jdbcType=VARCHAR},
            </if>
            <if test="phone != null">
@@ -171,21 +189,22 @@
                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}
    </update>
    <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
        update ba_user
        set `name` = #{name,jdbcType=VARCHAR},
        set blockId = #{blockId,jdbcType=BIGINT},
        `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" >
@@ -202,4 +221,39 @@
        update ba_user set deleted = 1
        where id = #{id,jdbcType=BIGINT}
    </delete>

    <!--根据用户编号获取用户信息-->
    <!--2024-01-09 废弃-->
    <select id="getUserInfos" resultType="com.dy.pipIrrGlobal.voBa.VoUserInfo">
        SELECT
            user.id AS userId,
            user.`name` AS userName,
            rol.id AS roleId,
            rol.`name` AS roleName,
            per.permissions
        FROM ba_user user
            INNER JOIN ba_user_role use_rol ON user.id = use_rol.userId
            INNER JOIN ba_role rol ON rol.id = use_rol.roleId
            INNER JOIN ba_role_permissions per ON per.roleId = rol.id
        <where>
            <if test = "userId != null and userId > 0">
                AND user.id = ${userId}
            </if>
        </where>
    </select>

    <!--根据用户编号获取用户信息-->
    <select id="getUserInfoById" resultType="java.util.Map">
        SELECT
            id AS userId,
            name AS userName
        FROM ba_user
        <where>
            AND disabled = 0
            AND deleted = 0
            <if test = "userId != null and userId > 0">
                AND ba_user.id = ${userId}
            </if>
        </where>
    </select>
</mapper>