From 7ea1526b4c4845b366702b9b08d732107cce7b49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Fri, 6 May 2022 09:06:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=80=99=E9=80=89=E4=BA=BA?= =?UTF-8?q?=E5=88=B0=E5=9B=A2=E9=98=9F=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xm/core/ctrl/XmProductController.java | 15 +--- .../com/xm/core/ctrl/XmTaskController.java | 86 ++++--------------- .../mapper/xm/core/dao/XmProductMapper.xml | 10 ++- 3 files changed, 31 insertions(+), 80 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java index 418c98e5..6b607b56 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java @@ -158,21 +158,12 @@ public class XmProductController { xmProduct.put("userid",user.getUserid()); if( !StringUtils.hasText(queryScope) && !(StringUtils.hasText(id) || StringUtils.hasText(projectId)|| StringUtils.hasText(pmUserid)||ids!=null ||ids!=null ) ){ - if(LoginUtils.isBranchAdmin()){ - xmProduct.put("branchId",user.getBranchId()); - }else{ + if(!LoginUtils.isBranchAdmin()){ xmProduct.put("compete",user.getUserid()); } } - if(!StringUtils.hasText((String) xmProduct.get("isTpl"))){ - xmProduct.put("isTpl","0"); - }else{ - if("1".equals(xmProduct.get("isTpl"))){ - xmProduct.remove("branchId"); - xmProduct.put("myBranchId",user.getBranchId()); - xmProduct.put("platformBranchId",platformBranchId); - } - } + xmProduct.put("platformBranchId",platformBranchId); + xmProduct.put("linkBranchId",user.getBranchId()); List> xmProductList = xmProductService.selectListMapByWhereWithState(xmProduct); //列出XmProduct列表 PageUtils.responePage(m, xmProductList); m.put("data",xmProductList); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java index 0f21e0e2..2f43d6fb 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java @@ -128,24 +128,22 @@ public class XmTaskController { RequestUtils.transformArray(xmTask, "tagIdList"); PageUtils.startPage(xmTask); String taskOut= (String) xmTask.get("taskOut"); - if(!"1".equals(taskOut)){ - String projectId= (String) xmTask.get("projectId"); - String myExecuserStatus= (String) xmTask.get("myExecuserStatus"); - String isMy= (String) xmTask.get("isMy"); - String myFocus= (String) xmTask.get("myFocus"); - String createUserid= (String) xmTask.get("createUserid"); - String executorUserid= (String) xmTask.get("executorUserid"); - String menuId= (String) xmTask.get("menuId"); - String productId= (String) xmTask.get("productId"); - String iterationId= (String) xmTask.get("iterationId"); - User user = LoginUtils.getCurrentUserInfo(); - xmTask.put("userid",user.getUserid()); - if( !(StringUtils.hasText(projectId) - || StringUtils.hasText(myExecuserStatus)|| StringUtils.hasText(isMy)|| StringUtils.hasText(myFocus)|| StringUtils.hasText(createUserid) - || StringUtils.hasText(executorUserid) || StringUtils.hasText(menuId) || StringUtils.hasText(productId)|| StringUtils.hasText(iterationId)) ){ - - xmTask.put("compete",user.getUserid()); - } + String projectId= (String) xmTask.get("projectId"); + String myExecuserStatus= (String) xmTask.get("myExecuserStatus"); + String isMy= (String) xmTask.get("isMy"); + String myFocus= (String) xmTask.get("myFocus"); + String createUserid= (String) xmTask.get("createUserid"); + String executorUserid= (String) xmTask.get("executorUserid"); + String menuId= (String) xmTask.get("menuId"); + String productId= (String) xmTask.get("productId"); + String iterationId= (String) xmTask.get("iterationId"); + User user = LoginUtils.getCurrentUserInfo(); + xmTask.put("userid",user.getUserid()); + if( !(StringUtils.hasText(projectId) + || StringUtils.hasText(myExecuserStatus)|| StringUtils.hasText(isMy)|| StringUtils.hasText(myFocus)|| StringUtils.hasText(createUserid) + || StringUtils.hasText(executorUserid) || StringUtils.hasText(menuId) || StringUtils.hasText(productId)|| StringUtils.hasText(iterationId)) ){ + + xmTask.put("compete",user.getUserid()); } List> xmTaskVoList = xmTaskService.getTask(xmTask); //列出XmTask列表 PageUtils.responePage(m,xmTaskVoList); @@ -229,55 +227,9 @@ public class XmTaskController { RequestUtils.transformArray(xmTask, "skillIds"); PageUtils.startPage(xmTask); xmTask.put("taskOut","1"); - String isDefault= (String) xmTask.get("isDefault"); - String pageNum= (String) xmTask.get("pageNum"); - String queryKeys="xm-out-tasks-default-"+pageNum; - List> xmTaskVoList=new ArrayList<>(); - if(!StringUtils.hasText(isDefault)){ - tips.setFailureMsg("isDefault-not-set","isDefault","isDefault参数必传，默认查询isDefault=1,非默认查询isDefault=0"); - }else if("1".equals(isDefault)){ - PageSerializable> tasks =xmTaskCacheService.getTasks(queryKeys); - if(tasks==null){ - xmTaskVoList = xmTaskService.getTask(xmTask); //列出XmTask列表 - tasks=new PageSerializable<>(xmTaskVoList); - xmTaskCacheService.putTasks(queryKeys,tasks); - PageUtils.responePage(m,xmTaskVoList); - }else{ - xmTaskVoList=tasks.getList(); - m.put("total",tasks.getTotal()); - } - }else { - xmTaskVoList = xmTaskService.getTask(xmTask); //列出XmTask列表 - PageUtils.responePage(m,xmTaskVoList); - if("1".equals(xmTask.get("withParents")) && !"1".equals(xmTask.get("isTop")) && xmTaskVoList.size()>0){ - - Set pidPathsSet=new HashSet<>(); - Set idSet=new HashSet<>(); - for (Map map : xmTaskVoList) { - String id= (String) map.get("id"); - idSet.add(id); - String pidPaths= (String) map.get("pidPaths"); - pidPaths=PubTool.getPidPaths(pidPaths,id); - if(pidPaths.length()<=3){ - continue; - } - pidPathsSet.add(pidPaths); - } - - if(pidPathsSet!=null && pidPathsSet.size()>0){ - List> parentList=xmTaskService.getTask(map("pidPathsList",pidPathsSet.stream().collect(Collectors.toList()))); - parentList=parentList.stream().filter(i->!idSet.contains(i.get("id"))).collect(Collectors.toList()); - if(parentList!=null && parentList.size()>0){ - xmTaskVoList.addAll(parentList); - m.put("total", NumberUtil.getInteger(m.get("total"),0)+parentList.size()); - } - } - } - } - - - - m.put("data",xmTaskVoList); + List> tasks=xmTaskService.getTask(xmTask); + PageUtils.responePage(m,tasks); + m.put("data",tasks); m.put("tips", tips); return m; } 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 0c5db8cb..110b064b 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 @@ -22,11 +22,19 @@ and ctime between #{ctimeStart} and #{ctimeEnd} - and (res.branch_id in( #{platformBranchId},#{myBranchId}) and res.is_tpl='1') + and (res.branch_id in( #{platformBranchId},#{linkBranchId}) and res.is_tpl='1') and res.del!="1" + + and ( res.branch_id = #{linkBranchId} + + or (res.branch_id in( #{platformBranchId},#{linkBranchId}) and res.is_tpl='1') + + ) + +