From 0c8e121ff848f2d8e99000e6e9cd504ff0c60422 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 03:33:03 +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 --- .../com/xm/core/ctrl/XmProjectGroupController.java | 13 ++++++++----- .../com/xm/core/service/XmProjectGroupService.java | 6 ++---- .../service/cache/XmProjectGroupCacheService.java | 3 +-- 3 files changed, 11 insertions(+), 11 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 ba40134b..ecea2322 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 @@ -121,7 +121,7 @@ public class XmProjectGroupController { xmProjectGroupCacheService.clearProductGroup(groupDb.getProductId()); xmRecordService.addXmProductGroupRecord(groupDb.getProductId(),groupDb.getId(),"团队-小组-修改小组","修改小组信息【"+groupDb.getGroupName()+"】"); }else { - xmProjectGroupCacheService.clearProjectGroup(groupDb.getProjectId(),groupDb.getId()); + xmProjectGroupCacheService.clearProjectGroup(groupDb.getProjectId()); xmRecordService.addXmGroupRecord(groupDb.getProjectId(),groupDb.getId(),"团队-小组-修改小组","修改小组信息【"+groupDb.getGroupName()+"】"); } @@ -228,11 +228,13 @@ public class XmProjectGroupController { if(!projectAdmMap.containsKey(u.getUserid())) { return ResponseHelper.failed("not-project-adm","您不是项目管理人员，不能创建小组。项目级助理以上人员可以创建小组。"); } + xmProjectGroup.setProductId(null); }else{ if(!StringUtils.hasText(xmProjectGroup.getProductId())){ return ResponseHelper.failed("productId-0","产品编号不能为空"); } + XmProduct product = xmProductService.selectOneObject(new XmProduct(xmProjectGroup.getProductId())); if(product==null){ return ResponseHelper.failed("product-0","产品已不存在"); @@ -245,6 +247,7 @@ public class XmProjectGroupController { if(!productAdmMap.containsKey(u.getUserid())) { return ResponseHelper.failed("not-product-adm","您不是产品管理人员，不能创建小组。产品级助理及以上人员可以创建小组。"); } + xmProjectGroup.setProjectId(null); } if (StringUtils.isEmpty(xmProjectGroup.getId())) { xmProjectGroup.setId(xmProjectGroupService.createKey("id")); @@ -263,7 +266,7 @@ public class XmProjectGroupController { xmRecordService.addXmProductGroupRecord(xmProjectGroup.getProductId(),xmProjectGroup.getId(),"团队-小组-新增小组","新增小组【"+xmProjectGroup.getGroupName()+"】"); }else { - xmProjectGroupCacheService.clearProjectGroup(xmProjectGroup.getProjectId(),xmProjectGroup.getId()); + xmProjectGroupCacheService.clearProjectGroup(xmProjectGroup.getProjectId()); xmRecordService.addXmProductGroupRecord(xmProjectGroup.getProductId(),xmProjectGroup.getId(),"团队-小组-新增小组","新增小组【"+xmProjectGroup.getGroupName()+"】"); } m.put("data",xmProjectGroup); @@ -297,7 +300,7 @@ public class XmProjectGroupController { } if(!"1".equals(groupDb.getPgClass())) { if(StringUtils.hasText(groupDb.getProjectId())){ - XmProject project = xmProjectService.getProjectFromCache(xmProjectGroup.getProjectId()); + XmProject project = xmProjectService.getProjectFromCache(groupDb.getProjectId()); if(project==null){ return ResponseHelper.failed("project-0","项目已不存在"); } @@ -310,7 +313,7 @@ public class XmProjectGroupController { }else{ if(!StringUtils.hasText(xmProjectGroup.getProductId())){ - XmProduct product = xmProductService.selectOneObject(new XmProduct(xmProjectGroup.getProductId())); + XmProduct product = xmProductService.selectOneObject(new XmProduct(groupDb.getProductId())); if(product==null){ return ResponseHelper.failed("product-0","产品已不存在"); } @@ -329,7 +332,7 @@ public class XmProjectGroupController { xmProjectGroupCacheService.clearProductGroup(groupDb.getProductId()); xmRecordService.addXmProductGroupRecord(groupDb.getProductId(),groupDb.getId(),"团队-小组-删除小组","删除小组【"+groupDb.getGroupName()+"】"); }else { - xmProjectGroupCacheService.clearProjectGroup(groupDb.getProjectId(),groupDb.getId()); + xmProjectGroupCacheService.clearProjectGroup(groupDb.getProjectId()); xmRecordService.addXmGroupRecord(groupDb.getProjectId(),groupDb.getId(),"团队-小组-删除小组","删除小组【"+groupDb.getGroupName()+"】"); } 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 8a78df2b..bad11c6f 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 @@ -136,8 +136,8 @@ public class XmProjectGroupService extends BaseService { } List groupUserList=this.xmProjectGroupUserService.selectGroupUserListByProjectId(projectId); if(groupUserList==null || groupUserList.size()==0) { - groupCacheService.putProjectGroups(projectId, groupVoList); - return groupVoList; + //groupCacheService.putProjectGroups(projectId, groupVoList); + //return groupVoList; } groupList.forEach(g -> { XmProjectGroupVo gvo = new XmProjectGroupVo(); @@ -216,8 +216,6 @@ public class XmProjectGroupService extends BaseService { } List groupUserList=this.xmProjectGroupUserService.selectGroupUserListByProductId(productId); if(groupUserList==null || groupUserList.size()==0) { - groupCacheService.putProductGroups(productId, groupVoList); - return groupVoList; } groupList.forEach(g -> { XmProjectGroupVo gvo = new XmProjectGroupVo(); diff --git a/xm-core/src/main/java/com/xm/core/service/cache/XmProjectGroupCacheService.java b/xm-core/src/main/java/com/xm/core/service/cache/XmProjectGroupCacheService.java index 99ac73ab..023ab6c6 100644 --- a/xm-core/src/main/java/com/xm/core/service/cache/XmProjectGroupCacheService.java +++ b/xm-core/src/main/java/com/xm/core/service/cache/XmProjectGroupCacheService.java @@ -63,9 +63,8 @@ public class XmProjectGroupCacheService { /** * * @param projectId - * @param groupId */ - public void clearProjectGroup(String projectId,String groupId){ + public void clearProjectGroup(String projectId){ String key=this.getProjectKey(projectId); this.clearProjectGroups(projectId); }