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 d9bc7e0c..dee656f5 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 @@ -178,6 +178,12 @@ public class XmProjectController { if(xmProjectDb==null){ tips.setFailureMsg("项目不存在"); } + if(!user.getBranchId().equals(xmProjectDb.getBranchId())){ + return ResponseHelper.failed("branchId-not-right","该项目不属于您的组织,不允许您进行删除"); + } + if(!"0".equals(xmProjectDb.getStatus())&&!"9".equals(xmProjectDb.getStatus())){ + return ResponseHelper.failed("status-not-0","该项目不属于初始或者已关闭状态,不允许删除"); + } if(user.getUserid().equals(xmProjectDb.getCreateUserid())){ xmProjectService.deleteByPk(xmProject); xmProjectService.clearProject(xmProject.getId()); diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProject.java b/xm-core/src/main/java/com/xm/core/entity/XmProject.java index 0abfe28e..a54ece55 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProject.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProject.java @@ -62,7 +62,16 @@ public class XmProject implements java.io.Serializable { @ApiModelProperty(notes="考核备注",allowEmptyValue=true,example="",allowableValues="") String assessRemarks; - @ApiModelProperty(notes="项目状态,cs-初始,lxz-立项中,ssz-执行中,jxz-结项中,yjx-已结项,ztz-暂停,sq-售前,sh-售后",allowEmptyValue=true,example="",allowableValues="") + @ApiModelProperty(notes="项目状态,0|初始\n" + + "1|售前\n" + + "2|立项中\n" + + "3|实施中\n" + + "4|暂停中\n" + + "5|结项中\n" + + "6|已结项\n" + + "7|售后\n" + + "8|已完成\n" + + "9|已关闭",allowEmptyValue=true,example="",allowableValues="") String status; @ApiModelProperty(notes="机构编号",allowEmptyValue=true,example="",allowableValues="") diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectService.java index 180e7522..8110b932 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectService.java @@ -88,6 +88,7 @@ public class XmProjectService extends BaseService { } xmProjectTo.setGroups(null); xmProjectTo.setIsTpl(isTpl); + xmProjectTo.setStatus("0"); xmProjectTo.setFromTplId(xmProjectDb.getId()); this.saveProject(xmProjectTo);