diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java index b1298b36..412c5e18 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java @@ -110,14 +110,11 @@ public class XmProjectController { xmProject.put("compete",user.getUserid()); } } - if(!StringUtils.hasText((String) xmProject.get("isTpl"))){ - xmProject.put("isTpl","0"); - }else{ - if("1".equals(xmProject.get("isTpl"))){ - xmProject.remove("branchId"); - xmProject.put("linkBranchId",user.getBranchId()); - xmProject.put("platformBranchId",platformBranchId); - } + + if("1".equals(xmProject.get("isTpl"))){ + xmProject.remove("branchId"); + xmProject.put("linkBranchId",user.getBranchId()); + xmProject.put("platformBranchId",platformBranchId); } xmProject.put("linkBranchId",user.getBranchId()); xmProject.put("platformBranchId",platformBranchId); diff --git a/xm-core/src/main/java/com/xm/core/vo/XmProjectCopyVo.java b/xm-core/src/main/java/com/xm/core/vo/XmProjectCopyVo.java index 60689a56..e6b42df5 100644 --- a/xm-core/src/main/java/com/xm/core/vo/XmProjectCopyVo.java +++ b/xm-core/src/main/java/com/xm/core/vo/XmProjectCopyVo.java @@ -9,6 +9,8 @@ public class XmProjectCopyVo { String copyTask;//是否复制任务 0否1是 String copyGroup;//是否复制组织架构 0否1是 String copyGroupUser;//是否复制组织架构中用户 0否1是 + String copyProduct;//是否复制关联的产品及需求明细 + String tplType;//模版公开范围 1-全网公开,2-本企业公开 public String getId() { return id; @@ -73,4 +75,20 @@ public class XmProjectCopyVo { public void setCopyGroupUser(String copyGroupUser) { this.copyGroupUser = copyGroupUser; } + + public String getCopyProduct() { + return copyProduct; + } + + public void setCopyProduct(String copyProduct) { + this.copyProduct = copyProduct; + } + + public String getTplType() { + return tplType; + } + + public void setTplType(String tplType) { + this.tplType = tplType; + } } 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 392bbd4b..aedb29fe 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 @@ -54,18 +54,15 @@ ) and res.name like concat('%',#{key} ,'%') - - and (res.branch_id in( #{platformBranchId},#{linkBranchId}) and res.is_tpl='1') + + and (res.branch_id =#{linkBranchId} and res.is_tpl='1' and res.tpl_type='2') + + + and ( res.is_tpl='1' and res.tpl_type='1') and res.del!="1" - - and ( res.branch_id=#{linkBranchId} - - or (res.branch_id in( #{platformBranchId},#{linkBranchId}) and res.is_tpl='1') - ) -