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 e9705aa3..38da721b 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 @@ -16,6 +16,9 @@ ( #{item}) + + and res.pid_paths like concat(#{pidPathsLike},'%') + and #{item} like concat(res.pid_paths,'%') 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 8158a01e..804395d0 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 @@ -30,7 +30,9 @@ and res.create_time > #{createTimeStart} and res.create_time < #{createTimeEnd} and (res.parent_taskid = '' or res.parent_taskid IS NULL) - + + and res.pid_paths like concat(#{pidPathsLike},'%') + and exists ( select 1 from xm_task_execuser exe where exe.task_id=res.id and exe.userid=#{userid}