From 6f5e02f2e65e3c03a3a1832d56848ffa783b37a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 30 Jan 2024 21:25:18 +0800
Subject: [PATCH] =?UTF-8?q?2.0-=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86xm?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=201=E4=BA=A7=E5=93=81=E3=80=81=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=88=97=E8=A1=A8=E5=90=8E=E7=AB=AF=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=9B=A2=E9=98=9F=E6=88=90=E5=91=98=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E6=9D=83=E9=99=90=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xm-core/src/main/java/com/xm/core/mapper/XmProductMapper.xml | 5 +++--
 xm-core/src/main/java/com/xm/core/mapper/XmProjectMapper.xml | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmProductMapper.xml b/xm-core/src/main/java/com/xm/core/mapper/XmProductMapper.xml
index 586cce05..f7d828f4 100644
--- a/xm-core/src/main/java/com/xm/core/mapper/XmProductMapper.xml
+++ b/xm-core/src/main/java/com/xm/core/mapper/XmProductMapper.xml
@@ -41,9 +41,10 @@
             )
 
         </if>
-        <if test='ext.isTpl==null or ext.isTpl=="0"'>
+        <if test='(ext.isTpl==null or ext.isTpl=="0") and (ext.linkProjectId ==null or ext.linkProjectId=="") and (ext.linkIterationId ==null or ext.linkIterationId=="")'>
             and (
-            (res.adm_userid= #{ext.myUserid} or res.pm_userid=#{ext.myUserid} or res.ass_userid=#{ext.myUserid})
+            exists(select 1 from xm_group_user gu where gu.userid=#{ext.myUserid} and gu.product_id=res.id)
+            or (res.adm_userid= #{ext.myUserid} or res.pm_userid=#{ext.myUserid} or res.ass_userid=#{ext.myUserid})
             or (CASE
             WHEN res.show_out = '1' THEN
             res.branch_id = #{ext.myBranchId}
diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmProjectMapper.xml b/xm-core/src/main/java/com/xm/core/mapper/XmProjectMapper.xml
index 7553759a..0196a88b 100644
--- a/xm-core/src/main/java/com/xm/core/mapper/XmProjectMapper.xml
+++ b/xm-core/src/main/java/com/xm/core/mapper/XmProjectMapper.xml
@@ -64,8 +64,9 @@
         <if test="ext.del==null or ext.del==''">
             and res.del!="1"
         </if>
-        <if test='ext.isTpl==null or ext.isTpl=="0"'>
+        <if test='(ext.isTpl==null or ext.isTpl=="0") and (ext.linkProductId ==null or ext.linkProductId=="") and (ext.linkIterationId ==null or ext.linkIterationId=="")'>
             and (
+            exists(select 1 from xm_group_user gu where gu.userid=#{ext.myUserid} and gu.project_id=res.id)
             (res.create_userid = #{ext.myUserid} or res.adm_userid= #{ext.myUserid} or res.pm_userid=#{ext.myUserid} or res.ass_userid=#{ext.myUserid})
             or (CASE
             WHEN res.show_out = '1' THEN