|
@@ -689,7 +689,7 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
|
|
|
}
|
|
|
sb.append("】已存在,请勿选择。");
|
|
|
if (sb.length() > 14) {
|
|
|
- return AjaxResult.success(sb);
|
|
|
+ return AjaxResult.error(sb.toString());
|
|
|
}
|
|
|
return AjaxResult.success();
|
|
|
}
|
|
@@ -845,7 +845,7 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
|
|
|
if (!ObjectUtils.isEmpty(planQuarter.getAppDelete()) && planQuarter.getAppDelete().equals("true")) {
|
|
|
//申请过的不能再申请
|
|
|
planQuarter.setAppDeleteDo("false");
|
|
|
- } else if (!planQuarter.getProjectStatus().equals("0")) {
|
|
|
+ } else if (planQuarter.getProjectStatus().equals("0")) {
|
|
|
//提交后可以申请撤销
|
|
|
planQuarter.setAppDeleteDo("false");
|
|
|
} else {
|
|
@@ -855,7 +855,7 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
|
|
|
if (!ObjectUtils.isEmpty(planQuarter.getAppUpdate()) && planQuarter.getAppUpdate().equals("true")) {
|
|
|
//申请过的不能再申请
|
|
|
planQuarter.setAppUpdateDo("false");
|
|
|
- } else if (!planQuarter.getProjectStatus().equals("0")) {
|
|
|
+ } else if (planQuarter.getProjectStatus().equals("0")) {
|
|
|
//提交后可以申请撤销
|
|
|
planQuarter.setAppUpdateDo("false");
|
|
|
} else {
|