Explorar o código

签发暂存跳转问题

[user3] %!s(int64=4) %!d(string=hai) anos
pai
achega
792825e62f

+ 1 - 1
src/main/java/com/jeeplus/modules/projectFilingBatch/service/ProjectFilingBatchService.java

@@ -425,7 +425,7 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
             projectFilingbatchRelationDao.insert(filingbatchRelation);
         }
         //新增项目树形信息
-        if (proInfos.length!=0|| null == proInfos){
+        if (null != proInfos && proInfos.length!=0 ){
             this.insertProInfo(proInfos,flags,proId,projectFilingBatch.getId());
         }
         long t4 = System.currentTimeMillis();

+ 6 - 0
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageNewTwoController.java

@@ -400,6 +400,9 @@ public class RuralProjectMessageNewTwoController  extends BaseController {
                 if (StringUtils.isNotBlank(projectcontentinfo.getEdit()) && projectcontentinfo.getEdit().equals("edit")){
                     return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
                 }
+                if (StringUtils.isNotBlank(projectcontentinfo.getView()) && projectcontentinfo.getView().equals("costLiu")){
+                    return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+                }
                 return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
             }
         }catch (Exception e){
@@ -410,6 +413,9 @@ public class RuralProjectMessageNewTwoController  extends BaseController {
         }
         addMessage(redirectAttributes, "暂存报告失败");
         ProjectRecords projectRecords = projectcontentinfo.getProject()==null?new ProjectRecords():projectcontentinfo.getProject();
+        if (StringUtils.isNotBlank(projectcontentinfo.getView()) && projectcontentinfo.getView().equals("costLiu")){
+            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+        }
         return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
     }