From febb7fbeec12c1afc8c156ee26b09a3d8143dab0 Mon Sep 17 00:00:00 2001 From: qqkj Date: Sun, 18 Apr 2021 13:42:03 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8F=8A=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BB=84=E7=9B=B8=E5=85=B3=E8=BF=9B=E8=A1=8C=E6=9D=83=E9=99=90?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xm/core/ctrl/XmProjectController.java | 10 +++++----- .../com/xm/core/service/XmProjectGroupService.java | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) 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 c4dfcbe9..26790de9 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 @@ -134,7 +134,7 @@ public class XmProjectController { Tips tips=new Tips("成功删除一条数据"); try{ User user= LoginUtils.getCurrentUserInfo(); - XmProject xmProjectDb=this.xmProjectService.selectOneObject(xmProject); + XmProject xmProjectDb=this.xmProjectService.getProjectFromCache(xmProject.getId()); if(xmProjectDb==null){ tips.setFailureMsg("项目不存在"); } @@ -173,7 +173,7 @@ public class XmProjectController { m.put("tips", tips); return m; } - XmProject xmProjectDb=this.xmProjectService.selectOneObject(xmProject); + XmProject xmProjectDb=this.xmProjectService.getProjectFromCache(xmProject.getId()); if(xmProjectDb==null){ tips.setFailureMsg("项目不存在"); m.put("tips", tips); @@ -218,7 +218,7 @@ public class XmProjectController { m.put("tips", tips); return m; } - XmProject xmProjectDb=this.xmProjectService.selectOneObject(xmProject); + XmProject xmProjectDb=this.xmProjectService.getProjectFromCache(xmProject.getId()); if(xmProjectDb==null){ tips.setFailureMsg("项目不存在"); m.put("tips", tips); @@ -263,7 +263,7 @@ public class XmProjectController { m.put("tips", tips); return m; } - XmProject xmProjectDb=this.xmProjectService.selectOneObject(xmProject); + XmProject xmProjectDb=this.xmProjectService.getProjectFromCache(xmProject.getId()); if(xmProjectDb==null){ tips.setFailureMsg("项目不存在"); m.put("tips", tips); @@ -308,7 +308,7 @@ public class XmProjectController { m.put("tips", tips); return m; } - XmProject xmProjectDb=this.xmProjectService.selectOneObject(xmProject); + XmProject xmProjectDb=this.xmProjectService.getProjectFromCache(xmProject.getId()); if(xmProjectDb==null){ tips.setFailureMsg("项目不存在"); m.put("tips", tips); diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectGroupService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectGroupService.java index f5c42956..b20528af 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectGroupService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectGroupService.java @@ -181,7 +181,7 @@ public class XmProjectGroupService extends BaseService { if(!isProjectCreate) { if(!isPm) { - throw new BizException("你既不是项目创建人，也不是项目经理，不允许删除项目小组，项目创建人为【"+project.getCreateUsername()+"】"); + throw new BizException("无权操作！只有项目创建人、项目经理可以删除小组"); } } delGroups.forEach(g->{ @@ -219,7 +219,7 @@ public class XmProjectGroupService extends BaseService { if(xmProjectGroupVoAdd.size()>0) { if(!isProjectCreate) { if(!isPm) { - throw new BizException("你不是项目创建人,也不是项目经理，不允许新增该项目的小组,项目创建人为【"+project.getCreateUsername()+"】"); + throw new BizException("您无权操作！只有项目创建人、项目经理可创建小组"); } } @@ -275,7 +275,7 @@ public class XmProjectGroupService extends BaseService { if(!isProjectCreate) { if(!isPm) { - throw new BizException("你不是项目创建人,也不是项目经理，不允许清空【"+gvo.getGroupName()+"】整个小组所有成员"); + throw new BizException("无权操作！只有项目创建人、项目经理可以清空小组成员"); } } @@ -366,7 +366,7 @@ public class XmProjectGroupService extends BaseService { } } if(!isHead) { - throw new BizException("你既不是项目创建人，也不是项目经理，也不是组长，不允许增加小组成员"); + throw new BizException("无权操作！只有项目创建人、项目经理、小组长可增加小组成员"); } } @@ -409,7 +409,7 @@ public class XmProjectGroupService extends BaseService { } } if(!isHead) { - throw new BizException("你既不是项目创建人，也不是项目经理，也不是组长，不允许删除小组成员"); + throw new BizException("无权操作！只有小组长、项目经理、项目创建人可以删除小组成员"); } } @@ -431,7 +431,7 @@ public class XmProjectGroupService extends BaseService { if(allUsersEdit.size()>0) { if(!isProjectCreate) { if(!isPm) { - throw new BizException("你不是项目创建人,也不是项目经理，不能调整组长"); + throw new BizException("无权操作！只有项目经理、项目创建人可以调整各小组组长"); } } List allUsersEdit2=new ArrayList<>();