From 9462b081599641ea4c7a0966b6724dd62ba9053e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Fri, 8 Apr 2022 18:42:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8A=82=E7=82=B9=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=A0=87=E7=AD=BE=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml | 5 ++--- .../resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml index 55a862a7..a3d6b976 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml @@ -21,9 +21,8 @@ and exists( select 1 from xm_iteration ppl where ppl.product_id=res.id and ppl.id=#{linkIterationId} ) - and ( exists ( select 1 from xm_group_user gu inner join xm_task t on gu.project_id=t.project_id and t.product_id=res.id where gu.userid=#{compete} and t.product_id=res.id ) - or res.pm_userid=#{compete} - or exists ( select 1 from xm_menu m where m.mm_userid=#{compete} and m.product_id=res.id) + and ( exists ( select 1 from xm_group_user gu inner join xm_product_project_link t on (gu.project_id=t.project_id or gu.product_id=t.product_id ) and t.product_id=res.id where gu.userid=#{compete} and t.product_id=res.id ) + or res.create_userid=#{compete} or res.pm_userid=#{compete} or res.pm_userid=#{compete} or res.adm_userid=#{compete} or res.ass_userid=#{compete} ) and ctime between #{ctimeStart} and #{ctimeEnd} diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml index 1d69d09c..43dd4509 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml @@ -24,8 +24,7 @@ and ( exists ( select 1 from xm_group g,XM.xm_group_user gu where gu.group_id=g.id and gu.userid=#{userid} and g.project_id=res.id ) - or res.create_userid=#{compete} - or exists ( select 1 from xm_task_execuser exe where exe.project_id=res.id and exe.userid=#{compete} ) + or res.pm_userid=#{compete} or res.adm_userid=#{compete} or res.ass_userid=#{compete} )