diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml index 38da721b..d442d9e3 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml @@ -49,6 +49,10 @@ and exists(select 1 from xm_task t where t.menu_id=res.menu_id and t.project_id=#{projectId}) + and res.start_time > #{planStartTimeStart} + and res.start_time < #{planStartTimeEnd} + and res.end_time > #{planEndTimeStart} + and res.end_time < #{planEndTimeEnd} and res.menu_name like #{key} and (res.pmenu_id is null ) and diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml index 60bd9ccb..7d71c857 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml @@ -27,8 +27,14 @@ find_in_set(#{item},res.tag_ids) - and res.create_time > #{createTimeStart} - and res.create_time < #{createTimeEnd} + and res.start_time > #{planStartTimeStart} + and res.start_time < #{planStartTimeEnd} + and res.end_time > #{planEndTimeStart} + and res.end_time < #{planEndTimeEnd} + and res.act_start_time > #{actStartTimeStart} + and res.act_start_time < #{actStartTimeEnd} + and res.act_end_time > #{actEndTimeStart} + and res.act_end_time < #{actEndTimeEnd} and (res.parent_taskid = '' or res.parent_taskid IS NULL) and res.pid_paths like concat(#{pidPathsLike},'%')