From fe44829d36cd855487ca38074ef68240bfefe325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sat, 26 Feb 2022 16:15:57 +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 --- .../xm/core/ctrl/XmProjectGroupController.java | 2 +- .../core/ctrl/XmProjectGroupUserController.java | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java index ecea2322..48826a06 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java @@ -86,7 +86,7 @@ public class XmProjectGroupController { m.put("tips", tips); return m; } - if(StringUtils.hasText(group.getId())){ + if(!StringUtils.hasText(group.getId())){ return ResponseHelper.failed("id-0","小组编号不能为空"); } User user=LoginUtils.getCurrentUserInfo(); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupUserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupUserController.java index 1cd999cd..bee1c99a 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupUserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupUserController.java @@ -151,7 +151,7 @@ public class XmProjectGroupUserController { return ResponseHelper.failed("product-0","产品已不存在"); } if(!xmProjectGroupService.checkUserIsProjectAdm(xmProject, user.getUserid())){ - XmProjectGroupVo xmProjectGroupVo=this.xmProjectGroupService.getProductGroupFromCache(xmProject.getId(),gu.getGroupId()); + XmProjectGroupVo xmProjectGroupVo=this.xmProjectGroupService.getProjectGroupFromCache(xmProject.getId(),gu.getGroupId()); if(xmProjectGroupVo==null){ return ResponseHelper.failed("group-0","小组已不存在"); } @@ -238,10 +238,10 @@ public class XmProjectGroupUserController { XmProject xmProject=this.xmProjectService.getProjectFromCache(gu.getProjectId()); if(xmProject==null){ - return ResponseHelper.failed("product-0","产品已不存在"); + return ResponseHelper.failed("project-0","项目已不存在"); } if(!xmProjectGroupService.checkUserIsProjectAdm(xmProject, user.getUserid())){ - XmProjectGroupVo xmProjectGroupVo=this.xmProjectGroupService.getProductGroupFromCache(xmProject.getId(),gu.getGroupId()); + XmProjectGroupVo xmProjectGroupVo=this.xmProjectGroupService.getProjectGroupFromCache(xmProject.getId(),gu.getGroupId()); if(xmProjectGroupVo==null){ return ResponseHelper.failed("group-0","小组已不存在"); } @@ -400,7 +400,7 @@ public class XmProjectGroupUserController { if(xmProduct==null){ return ResponseHelper.failed("product-0","产品已不存在"); } - gus2=gusDb.stream().filter(i->productId.equals(i.getProductId())).collect(Collectors.toList()); + gus2=gus.stream().filter(i->productId.equals(i.getProductId())).collect(Collectors.toList()); if(gus2.size()projectId.equals(i.getProductId())).collect(Collectors.toList()); + gus2=gus.stream().filter(i->projectId.equals(i.getProjectId())).collect(Collectors.toList()); if(gus2.size()projectId.equals(i.getProductId())).collect(Collectors.toList()); + gus2=gusDb.stream().filter(i->projectId.equals(i.getProjectId())).collect(Collectors.toList()); if(gus2.size()