Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

20200422-zlp-1

Browse Source 
园历展示
This commit is contained in:
paidaxing444
2020-04-22 11:55:20 +08:00
parent a2fa5e6428
commit cf20c0d85b
9 changed files with 146 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ruoyi/src/main/resources/mybatis/benyi/BySchoolcalendarMapper.xml
View File

@ -26,11 +26,16 @@
<if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
<if test="type != null and type != ''">and type = #{type}</if>
<if test="scope != null and scope != ''">and scope like concat('%', #{scope}, '%')</if>
<if test="xnxq != null and xnxq != ''">and xnxq = #{xnxq}</if>
<if test="xnxq != null and xnxq != ''">and xnxq like concat('%', #{xnxq}, '%')</if>
<if test="deptid != null ">and dept_id = #{deptid}</if>
<if test="activitytime != null ">and activitytime = #{activitytime}</if>
<if test="createuserid != null ">and createuserid = #{createuserid}</if>
<if test="createtime != null ">and createtime = #{createtime}</if>
<if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
AND date_format(activitytime,'%y%m%d') &gt;= date_format(#{beginTime},'%y%m%d')
</if>
<if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
AND date_format(activitytime,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
</if>
<!-- 数据范围过滤 -->
${dataScope}

2
ruoyi/src/main/resources/mybatis/system/SysPostMapper.xml
View File

@ -36,6 +36,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND post_name like concat('%', #{postName}, '%')
</if>
</where>
order by post_sort
</select>
<select id="selectPostAll" resultMap="SysPostResult">

7
ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml
View File

@ -58,12 +58,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectRoleAll" resultMap="SysRoleResult">
<include refid="selectRoleVo"/>
WHERE r.del_flag = '0'
</select>
<select id="selectYeyRoleAll" resultMap="SysRoleResult">
<include refid="selectRoleVo"/>
where r.purpose = '1' and r.del_flag = '0'
where r.purpose = '1'
</select>
<select id="selectRoleListByUserId" parameterType="Long" resultType="Integer">
@ -71,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from sys_role r
left join sys_user_role ur on ur.role_id = r.role_id
left join sys_user u on u.user_id = ur.user_id
where u.user_id = #{userId} and r.del_flag = '0'
where u.user_id = #{userId}
</select>
<select id="selectYeyRoleListByUserId" parameterType="Long" resultType="Integer">
@ -79,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from sys_role r
left join sys_user_role ur on ur.role_id = r.role_id
left join sys_user u on u.user_id = ur.user_id
where r.purpose = '1' and u.user_id = #{userId} and r.del_flag = '0'
where r.purpose = '1' and u.user_id = #{userId}
</select>
<select id="selectRoleById" parameterType="Long" resultMap="SysRoleResult">