20200617-zlp-1
多部门切换 视频学习页面 过滤bug
This commit is contained in:
paidaxing444
@ -1,43 +1,43 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.ruoyi.project.system.mapper.BySchoolMapper">
|
||||
|
||||
|
||||
<resultMap type="BySchool" id="BySchoolResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="xxdm" column="xxdm" />
|
||||
<result property="schoolName" column="school_name" />
|
||||
<result property="nameShort" column="name_short" />
|
||||
<result property="type" column="type" />
|
||||
<result property="parentId" column="parent_id" />
|
||||
<result property="province" column="province" />
|
||||
<result property="provincename" column="provincename" />
|
||||
<result property="regionid" column="regionid" />
|
||||
<result property="regionname" column="regionname" />
|
||||
<result property="area" column="area" />
|
||||
<result property="areaname" column="areaname" />
|
||||
<result property="address" column="address" />
|
||||
<result property="mastername" column="mastername" />
|
||||
<result property="tel" column="tel" />
|
||||
<result property="emMan" column="em_man" />
|
||||
<result property="emTel" column="em_tel" />
|
||||
<result property="status" column="status" />
|
||||
<result property="scale" column="scale" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="createUser" column="create_user" />
|
||||
<result property="approvalUser" column="approval_user" />
|
||||
<result property="approvalTime" column="approval_time" />
|
||||
<result property="remark" column="remark" />
|
||||
<result property="location" column="location" />
|
||||
<result property="isDemonstr" column="is_demonstr" />
|
||||
<result property="businesslicenseimg" column="businesslicenseimg" />
|
||||
<result property="openBook" column="open_book" />
|
||||
<result property="feeStatus" column="fee_status" />
|
||||
<result property="openDeadline" column="open_deadline" />
|
||||
<result property="dqxn" column="dqxn" />
|
||||
<result property="dqxq" column="dqxq" />
|
||||
<result property="isDel" column="is_del" />
|
||||
<result property="id" column="id"/>
|
||||
<result property="xxdm" column="xxdm"/>
|
||||
<result property="schoolName" column="school_name"/>
|
||||
<result property="nameShort" column="name_short"/>
|
||||
<result property="type" column="type"/>
|
||||
<result property="parentId" column="parent_id"/>
|
||||
<result property="province" column="province"/>
|
||||
<result property="provincename" column="provincename"/>
|
||||
<result property="regionid" column="regionid"/>
|
||||
<result property="regionname" column="regionname"/>
|
||||
<result property="area" column="area"/>
|
||||
<result property="areaname" column="areaname"/>
|
||||
<result property="address" column="address"/>
|
||||
<result property="mastername" column="mastername"/>
|
||||
<result property="tel" column="tel"/>
|
||||
<result property="emMan" column="em_man"/>
|
||||
<result property="emTel" column="em_tel"/>
|
||||
<result property="status" column="status"/>
|
||||
<result property="scale" column="scale"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="createUser" column="create_user"/>
|
||||
<result property="approvalUser" column="approval_user"/>
|
||||
<result property="approvalTime" column="approval_time"/>
|
||||
<result property="remark" column="remark"/>
|
||||
<result property="location" column="location"/>
|
||||
<result property="isDemonstr" column="is_demonstr"/>
|
||||
<result property="businesslicenseimg" column="businesslicenseimg"/>
|
||||
<result property="openBook" column="open_book"/>
|
||||
<result property="feeStatus" column="fee_status"/>
|
||||
<result property="openDeadline" column="open_deadline"/>
|
||||
<result property="dqxn" column="dqxn"/>
|
||||
<result property="dqxq" column="dqxq"/>
|
||||
<result property="isDel" column="is_del"/>
|
||||
|
||||
</resultMap>
|
||||
|
||||
@ -48,42 +48,46 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<select id="selectBySchoolList" parameterType="BySchool" resultMap="BySchoolResult">
|
||||
<include refid="selectBySchoolVo"/>
|
||||
where is_del = '0'
|
||||
<if test="xxdm != null and xxdm != ''"> and xxdm like concat('%', #{xxdm}, '%')</if>
|
||||
<if test="schoolName != null and schoolName != ''"> and school_name like concat('%', #{schoolName}, '%')</if>
|
||||
<if test="nameShort != null and nameShort != ''"> and name_short = #{nameShort}</if>
|
||||
<if test="type != null "> and type = #{type}</if>
|
||||
<if test="parentId != null "> and parent_id = #{parentId}</if>
|
||||
<if test="province != null and province != ''"> and province = #{province}</if>
|
||||
<if test="provincename != null and provincename != ''"> and provincename like concat('%', #{provincename}, '%')</if>
|
||||
<if test="regionid != null and regionid != ''"> and regionid = #{regionid}</if>
|
||||
<if test="regionname != null and regionname != ''"> and regionname like concat('%', #{regionname}, '%')</if>
|
||||
<if test="area != null and area != ''"> and area = #{area}</if>
|
||||
<if test="areaname != null and areaname != ''"> and areaname like concat('%', #{areaname}, '%')</if>
|
||||
<if test="address != null and address != ''"> and address = #{address}</if>
|
||||
<if test="mastername != null and mastername != ''"> and mastername like concat('%', #{mastername}, '%')</if>
|
||||
<if test="tel != null and tel != ''"> and tel = #{tel}</if>
|
||||
<if test="emMan != null and emMan != ''"> and em_man = #{emMan}</if>
|
||||
<if test="emTel != null and emTel != ''"> and em_tel = #{emTel}</if>
|
||||
<if test="status != null "> and status = #{status}</if>
|
||||
<if test="scale != null "> and scale = #{scale}</if>
|
||||
<if test="createUser != null "> and create_user = #{createUser}</if>
|
||||
<if test="approvalUser != null "> and approval_user = #{approvalUser}</if>
|
||||
<if test="approvalTime != null "> and approval_time = #{approvalTime}</if>
|
||||
<if test="location != null and location != ''"> and location = #{location}</if>
|
||||
<if test="isDemonstr != null "> and is_demonstr = #{isDemonstr}</if>
|
||||
<if test="businesslicenseimg != null and businesslicenseimg != ''"> and businesslicenseimg = #{businesslicenseimg}</if>
|
||||
<if test="openBook != null "> and open_book = #{openBook}</if>
|
||||
<if test="feeStatus != null "> and fee_status = #{feeStatus}</if>
|
||||
<if test="openDeadline != null "> and open_deadline = #{openDeadline}</if>
|
||||
<if test="dqxn != null and dqxn != ''"> and dqxn = #{dqxn}</if>
|
||||
<if test="dqxq != null and dqxq != ''"> and dqxq = #{dqxq}</if>
|
||||
<if test="xxdm != null and xxdm != ''">and xxdm like concat('%', #{xxdm}, '%')</if>
|
||||
<if test="schoolName != null and schoolName != ''">and school_name like concat('%', #{schoolName}, '%')</if>
|
||||
<if test="nameShort != null and nameShort != ''">and name_short = #{nameShort}</if>
|
||||
<if test="type != null ">and type = #{type}</if>
|
||||
<if test="parentId != null ">and parent_id = #{parentId}</if>
|
||||
<if test="province != null and province != ''">and province = #{province}</if>
|
||||
<if test="provincename != null and provincename != ''">and provincename like concat('%', #{provincename},
|
||||
'%')
|
||||
</if>
|
||||
<if test="regionid != null and regionid != ''">and regionid = #{regionid}</if>
|
||||
<if test="regionname != null and regionname != ''">and regionname like concat('%', #{regionname}, '%')</if>
|
||||
<if test="area != null and area != ''">and area = #{area}</if>
|
||||
<if test="areaname != null and areaname != ''">and areaname like concat('%', #{areaname}, '%')</if>
|
||||
<if test="address != null and address != ''">and address = #{address}</if>
|
||||
<if test="mastername != null and mastername != ''">and mastername like concat('%', #{mastername}, '%')</if>
|
||||
<if test="tel != null and tel != ''">and tel like concat('%', #{tel}, '%')</if>
|
||||
<if test="emMan != null and emMan != ''">and em_man = #{emMan}</if>
|
||||
<if test="emTel != null and emTel != ''">and em_tel = #{emTel}</if>
|
||||
<if test="status != null ">and status = #{status}</if>
|
||||
<if test="scale != null ">and scale = #{scale}</if>
|
||||
<if test="createUser != null ">and create_user = #{createUser}</if>
|
||||
<if test="approvalUser != null ">and approval_user = #{approvalUser}</if>
|
||||
<if test="approvalTime != null ">and approval_time = #{approvalTime}</if>
|
||||
<if test="location != null and location != ''">and location = #{location}</if>
|
||||
<if test="isDemonstr != null ">and is_demonstr = #{isDemonstr}</if>
|
||||
<if test="businesslicenseimg != null and businesslicenseimg != ''">and businesslicenseimg =
|
||||
#{businesslicenseimg}
|
||||
</if>
|
||||
<if test="openBook != null ">and open_book = #{openBook}</if>
|
||||
<if test="feeStatus != null ">and fee_status = #{feeStatus}</if>
|
||||
<if test="openDeadline != null ">and open_deadline = #{openDeadline}</if>
|
||||
<if test="dqxn != null and dqxn != ''">and dqxn = #{dqxn}</if>
|
||||
<if test="dqxq != null and dqxq != ''">and dqxq = #{dqxq}</if>
|
||||
</select>
|
||||
|
||||
|
||||
<select id="selectBySchoolById" parameterType="Long" resultMap="BySchoolResult">
|
||||
<include refid="selectBySchoolVo"/>
|
||||
where id = #{id}
|
||||
</select>
|
||||
|
||||
|
||||
<insert id="insertBySchool" parameterType="BySchool" useGeneratedKeys="true" keyProperty="id">
|
||||
insert into by_school
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
@ -118,7 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="openDeadline != null ">open_deadline,</if>
|
||||
<if test="dqxn != null and dqxn != ''">dqxn,</if>
|
||||
<if test="dqxq != null and dqxq != ''">dqxq,</if>
|
||||
</trim>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="xxdm != null and xxdm != ''">#{xxdm},</if>
|
||||
<if test="schoolName != null and schoolName != ''">#{schoolName},</if>
|
||||
@ -151,7 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="openDeadline != null ">#{openDeadline},</if>
|
||||
<if test="dqxn != null and dqxn != ''">#{dqxn},</if>
|
||||
<if test="dqxq != null and dqxq != ''">#{dqxq},</if>
|
||||
</trim>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateBySchool" parameterType="BySchool">
|
||||
@ -182,7 +186,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="remark != null and remark != ''">remark = #{remark},</if>
|
||||
<if test="location != null and location != ''">location = #{location},</if>
|
||||
<if test="isDemonstr != null ">is_demonstr = #{isDemonstr},</if>
|
||||
<if test="businesslicenseimg != null and businesslicenseimg != ''">businesslicenseimg = #{businesslicenseimg},</if>
|
||||
<if test="businesslicenseimg != null and businesslicenseimg != ''">businesslicenseimg =
|
||||
#{businesslicenseimg},
|
||||
</if>
|
||||
<if test="openBook != null ">open_book = #{openBook},</if>
|
||||
<if test="feeStatus != null ">fee_status = #{feeStatus},</if>
|
||||
<if test="openDeadline != null ">open_deadline = #{openDeadline},</if>
|
||||
@ -202,5 +208,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
|
||||
</mapper>
|
||||
@ -28,6 +28,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
from sys_dept d
|
||||
</sql>
|
||||
|
||||
<select id="selectSysDeptList" parameterType="Long" resultMap="SysDeptResult">
|
||||
select * from sys_dept where dept_id in (
|
||||
select dept_id from (
|
||||
select dept_id,user_id from sys_user
|
||||
union all
|
||||
select dept_id,user_id from sys_user_dept) t
|
||||
where t.user_id=#{userId})
|
||||
</select>
|
||||
|
||||
|
||||
<select id="selectDeptListByUserId" parameterType="Long" resultType="Integer">
|
||||
select p.dept_id
|
||||
|
||||
Reference in New Issue
Block a user