Browse Source

项目暂存状态管理员可删除

user5 2 years ago
parent
commit
f3266bd478

+ 1 - 1
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectRecordsController.java

@@ -719,7 +719,7 @@ public class RuralCostProjectRecordsController extends BaseController {
     public String adminDelete(RuralProjectRecords projectRecords, RedirectAttributes redirectAttributes) {
         String flag = projectRecords.getCompanyType();
         int status = projectRecords.getProjectStatus();
-        if (status == ProjectStatusEnum.SIGNED.getValue() || status == ProjectStatusEnum.INVALID.getValue()) {
+        if (status == ProjectStatusEnum.SIGNED.getValue() || status == ProjectStatusEnum.INVALID.getValue() || status == ProjectStatusEnum.TSTORE.getValue()) {
             projectRecordsService.adminDelete(projectRecords);
             addMessage(redirectAttributes, "管理员删除项目成功");
             return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage&companyType="+flag;

+ 1 - 1
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectRecordsController.java

@@ -600,7 +600,7 @@ public class RuralProjectRecordsController extends BaseController {
     public String adminDelete(RuralProjectRecords projectRecords, RedirectAttributes redirectAttributes) {
         String flag = projectRecords.getCompanyType();
         int status = projectRecords.getProjectStatus();
-        if (status == ProjectStatusEnum.SIGNED.getValue() || status == ProjectStatusEnum.INVALID.getValue()) {
+        if (status == ProjectStatusEnum.SIGNED.getValue() || status == ProjectStatusEnum.INVALID.getValue() || status == ProjectStatusEnum.TSTORE.getValue()) {
             projectRecordsService.adminDelete(projectRecords);
             addMessage(redirectAttributes, "管理员删除项目成功");
             return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectRecords/?repage&companyType=" + flag;