Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

2022-10-28 899e021604c2dc1660fe9b240f041f7bef56563b

 ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml

@@ -18,10 +18,64 @@
        <result column="ip_address" property="ipAddress"/>
        <result column="is_dy" property="isDy"/>
        <result column="job_title" property="jobTitle"/>
        <result column="department_id" property="departmentId"/>
        <result column="user_type" property="userType"/>
        <result column="zj" property="zj"/>
        <result column="mobile" property="mobile"/>
    </resultMap>
    <resultMap type="com.ycl.entity.user.UmsAdmin" id="CondMapResultMap" extends="BaseResultMap">
        <association property="depart" javaType="com.ycl.entity.depart.UmsDepart">
            <id column="depart_id" property="id"/>
            <result column="depart_name" property="departName"/>
            <result column="depart_des" property="departDes"/>
            <result column="depart_type" property="departType"/>
            <result column="parent_id" property="parentId"/>
            <result column="depart_status" property="status"/>
            <result column="depart_create_time" property="createTime"/>
            <result column="depart_update_time" property="updateTime"/>
            <result column="is_deleted" property="isDeleted"/>
        </association>
        <collection property="roles" javaType="ArrayList" ofType="com.ycl.entity.user.UmsRole">
            <id column="role_id" property="id" />
            <result column="name" property="name" />
            <result column="description" property="description" />
            <result column="admin_count" property="adminCount" />
            <result column="role_create_time" property="createTime" />
            <result column="role_status" property="status" />
            <result column="sort" property="sort" />
        </collection>
    </resultMap>

    <resultMap id="adminMap" type="com.ycl.entity.user.UmsAdmin">
        <id column="id" property="id"/>
        <result column="username" property="username"/>
        <result column="password" property="password"/>
        <result column="icon" property="icon"/>
        <result column="email" property="email"/>
        <result column="nick_name" property="nickName"/>
        <result column="note" property="note"/>
        <result column="create_time" property="createTime"/>
        <result column="login_time" property="loginTime"/>
        <result column="status" property="status"/>
        <result column="mac_address" property="macAddress"/>
        <result column="ip_address" property="ipAddress"/>
        <result column="is_dy" property="isDy"/>
        <result column="job_title" property="jobTitle"/>
        <result column="depart_name" property="departName"/>
        <result column="departmentId" property="departmentId"/>
        <result column="user_type" property="userType"/>
        <result column="zj" property="zj"/>
        <result column="mobile" property="mobile"/>
        <!--一对多映射用这个  ofTyp是一对多的集合的所存放的实体类  javaType实体类的属性类型-->
        <collection property="roles" ofType="com.ycl.entity.user.UmsRole" javaType="list" column="id"
                    select="selectAdminRoles">
            <id column="id" property="id"/>
            <result column="name" property="name"/>
            <result column="description" property="description"/>
            <result column="admin_count" property="adminCount"/>
            <result column="create_time" property="createTime"/>
            <result column="status" property="status"/>
            <result column="sort" property="sort"/>
        </collection>
    </resultMap>

    <select id="getAdminIdList" resultType="java.lang.Long">
@@ -30,5 +84,71 @@
                 LEFT JOIN ums_admin_role_relation ar ON rr.role_id = ar.role_id
        WHERE rr.resource_id = #{resourceId}
    </select>
    <select id="selectPageByWordKey" resultMap="adminMap">
        SELECT t1.*,
        t3.depart_name,
        t3.id as departmentId
        FROM `ums_admin` t1
        LEFT JOIN ums_depart_manager t2 ON t1.id = t2.user_id
        LEFT JOIN ums_depart t3 ON t2.depart_id = t3.id
        <where>
            <if test="keyword !=null and keyword !='' ">
                (
                t1.username LIKE concat('%', #{keyword}, '%')
                OR t1.nick_name LIKE concat('%', #{keyword}, '%')
                OR t1.mobile LIKE concat('%', #{keyword}, '%')
                )
            </if>
        </where>
    </select>
    <select id="selectAdminRoles" resultType="com.ycl.entity.user.UmsRole">
        select t5.*
        from `ums_admin` t1
                 left join ums_admin_role_relation t4 on t1.id = t4.admin_id
                 left join
             ums_role t5 on t4.role_id = t5.id
             where t1.id=#{id}
    </select>

    <select id="selectCondPage" parameterType="com.ycl.entity.user.UmsAdmin" resultMap="CondMapResultMap">
        SELECT
            ua.*,
            ud.id depart_id,
            ud.depart_name,
            ud.depart_des,
            ud.depart_type,
            ud.parent_id,
            ud.create_time depat_create_time,
            ud.update_time depat_update_time,
            ud.STATUS depart_status,
            ud.is_deleted,
            ur.id role_id,
            ur.id NAME,
            ur.description,
            ur.admin_count,
            ur.create_time role_create_time,
            ur.STATUS role_status,
            ur.sort
        FROM
            ums_admin ua
                LEFT JOIN ums_depart_manager udm ON ua.id = udm.user_id
                LEFT JOIN ums_depart ud ON udm.depart_id = ud.id
                LEFT JOIN ums_admin_role_relation uarr ON ua.id = uarr.admin_id
                LEFT JOIN ums_role ur ON uarr.role_id = ur.id
        where 1=1
        <if test="umsAdmin.keyword !=null and umsAdmin.keyword =''">
            AND (ua.username LIKE concat('%',#{umsAdmin.keyword,jdbcType=VARCHAR},'%')
                     or ua.nick_name LIKE concat('%',#{umsAdmin.keyword,jdbcType=VARCHAR},'%')
                     or ua.mobile ua.nick_name LIKE concat('%',#{umsAdmin.keyword,jdbcType=VARCHAR},'%'))
        </if>
        <if test="umsAdmin.userType !=null and umsAdmin.userType >=0 ">
            AND ua.user_type = #{umsAdmin.userType}
        </if>
        <if test="umsAdmin.jobTitle !=null and umsAdmin.jobTitle=''">
            AND ua.job_title = #{umsAdmin.jobTitle}
        </if>
        ORDER BY
            ua.id DESC
    </select>

</mapper>