liurunyu
2024-05-30 bbe9826b889664d124e2fac69b5b900ad97f8351
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
@@ -13,8 +13,10 @@
        <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">
@@ -267,7 +269,7 @@
        SELECT
            COUNT(*) AS recordCount
        FROM ba_user user
            INNER JOIN ba_user_role usro ON usro.userId = user.id
<!--            INNER JOIN ba_user_role usro ON usro.userId = user.id-->
        <where>
            AND user.supperAdmin != 1
            AND user.deleted = 0
@@ -300,7 +302,7 @@
            CAST(blockId AS char) AS blockId,
            (SELECT name FROM ba_block WHERE id = user.blockId) AS blockName
        FROM ba_user user
            INNER JOIN ba_user_role usro ON usro.userId = user.id
<!--            INNER JOIN ba_user_role usro ON usro.userId = user.id-->
        <where>
            AND user.supperAdmin != 1
            AND user.deleted = 0