Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageNewController.java

@@ -1476,11 +1476,16 @@ public class RuralCostProjectMessageNewController extends BaseController {
             addMessage(redirectAttributes, "上报流程审批失败");
             logger.error("上报流程审批失败：",e);
         }
-
+        RuralProjectRecords ruralProjectRecords = projectRecordsService.get(reported.getProjectId());
         if (StringUtils.isNotBlank(reported.getHome()) && "home".equals(reported.getHome())){
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
         }else {
-            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+            if("1".equals(ruralProjectRecords.getProjectType())){
+                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+            }else if("2".equals(ruralProjectRecords.getProjectType())){
+                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+            }
+            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
         }
     }