end7less
/
program_xm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

添加节点类型、标签等

master
陈裕财 4 years ago
parent
073744aa49
commit
fe44829d36
2 changed files with 9 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java
  2. 16
      xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupUserController.java

2
xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java
View File

@ -86,7 +86,7 @@ public class XmProjectGroupController {
m.put("tips", tips); m.put("tips", tips);
return m; return m;
} }
if(StringUtils.hasText(group.getId())){
if(!StringUtils.hasText(group.getId())){
return ResponseHelper.failed("id-0","小组编号不能为空"); return ResponseHelper.failed("id-0","小组编号不能为空");
} }
User user=LoginUtils.getCurrentUserInfo(); User user=LoginUtils.getCurrentUserInfo();

16
xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupUserController.java
View File

@ -151,7 +151,7 @@ public class XmProjectGroupUserController {
return ResponseHelper.failed("product-0","产品已不存在"); return ResponseHelper.failed("product-0","产品已不存在");
} }
if(!xmProjectGroupService.checkUserIsProjectAdm(xmProject, user.getUserid())){ 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){ if(xmProjectGroupVo==null){
return ResponseHelper.failed("group-0","小组已不存在"); return ResponseHelper.failed("group-0","小组已不存在");
} }
@ -238,10 +238,10 @@ public class XmProjectGroupUserController {
XmProject xmProject=this.xmProjectService.getProjectFromCache(gu.getProjectId()); XmProject xmProject=this.xmProjectService.getProjectFromCache(gu.getProjectId());
if(xmProject==null){ if(xmProject==null){
return ResponseHelper.failed("product-0","产品已不存在");
return ResponseHelper.failed("project-0","项目已不存在");
} }
if(!xmProjectGroupService.checkUserIsProjectAdm(xmProject, user.getUserid())){ 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){ if(xmProjectGroupVo==null){
return ResponseHelper.failed("group-0","小组已不存在"); return ResponseHelper.failed("group-0","小组已不存在");
} }
@ -400,7 +400,7 @@ public class XmProjectGroupUserController {
if(xmProduct==null){ if(xmProduct==null){
return ResponseHelper.failed("product-0","产品已不存在"); 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()<gusDb.size()){ if(gus2.size()<gusDb.size()){
return ResponseHelper.failed("data-0","批量新增只能新增同一个产品的成员。"); return ResponseHelper.failed("data-0","批量新增只能新增同一个产品的成员。");
} }
@ -409,7 +409,7 @@ public class XmProjectGroupUserController {
if(xmProject==null){ if(xmProject==null){
return ResponseHelper.failed("project-0","项目已不存在"); return ResponseHelper.failed("project-0","项目已不存在");
} }
gus2=gusDb.stream().filter(i->projectId.equals(i.getProductId())).collect(Collectors.toList());
gus2=gus.stream().filter(i->projectId.equals(i.getProjectId())).collect(Collectors.toList());
if(gus2.size()<gusDb.size()){ if(gus2.size()<gusDb.size()){
return ResponseHelper.failed("data-0","批量新增只能新增同一个项目的成员。"); return ResponseHelper.failed("data-0","批量新增只能新增同一个项目的成员。");
} }
@ -434,7 +434,7 @@ public class XmProjectGroupUserController {
}else { }else {
boolean isPm=xmProjectGroupService.checkUserIsProjectAdm(xmProject,user.getUserid()); boolean isPm=xmProjectGroupService.checkUserIsProjectAdm(xmProject,user.getUserid());
if(!isPm){ if(!isPm){
XmProjectGroupVo xmProjectGroupVo=this.xmProjectGroupService.getProjectGroupFromCache(xmProduct.getId(),groupId);
XmProjectGroupVo xmProjectGroupVo=this.xmProjectGroupService.getProjectGroupFromCache(xmProject.getId(),groupId);
if(xmProjectGroupVo==null){ if(xmProjectGroupVo==null){
continue; continue;
} }
@ -533,7 +533,7 @@ public class XmProjectGroupUserController {
if(xmProject==null){ if(xmProject==null){
return ResponseHelper.failed("project-0","项目已不存在"); return ResponseHelper.failed("project-0","项目已不存在");
} }
gus2=gusDb.stream().filter(i->projectId.equals(i.getProductId())).collect(Collectors.toList());
gus2=gusDb.stream().filter(i->projectId.equals(i.getProjectId())).collect(Collectors.toList());
if(gus2.size()<gusDb.size()){ if(gus2.size()<gusDb.size()){
return ResponseHelper.failed("data-0","批量删除只能删除同一个项目的成员。"); return ResponseHelper.failed("data-0","批量删除只能删除同一个项目的成员。");
} }
@ -558,7 +558,7 @@ public class XmProjectGroupUserController {
}else { }else {
boolean isPm=xmProjectGroupService.checkUserIsProjectAdm(xmProject,user.getUserid()); boolean isPm=xmProjectGroupService.checkUserIsProjectAdm(xmProject,user.getUserid());
if(!isPm){ if(!isPm){
XmProjectGroupVo xmProjectGroupVo=this.xmProjectGroupService.getProjectGroupFromCache(xmProduct.getId(),groupId);
XmProjectGroupVo xmProjectGroupVo=this.xmProjectGroupService.getProjectGroupFromCache(xmProject.getId(),groupId);
if(xmProjectGroupVo==null){ if(xmProjectGroupVo==null){
continue; continue;
} }

Write Preview
Loading…
Cancel
Save