Переглянути джерело

暂存质量复核查看功能修复

user5 3 роки тому
батько
коміт
ac5e171c46

+ 10 - 6
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectViewController.java

@@ -434,11 +434,13 @@ public class RuralProjectViewController extends BaseController {
             if(StringUtils.isNotBlank(bzshbConsultant.getZixunyuan())){
                 consultants.add(bzshbConsultant);
             }else{
-                User user=userService.get(projectReportData.getBzshbUserId());
-                bzshbConsultant.setZixunyuanName("陈红星("+user.getName()+"代)");
-                bzshbConsultant.setZixunyuan(user.getId());
-                bzshbConsultant.setRole("技术负责人");
-                consultants.add(bzshbConsultant);
+                if(StringUtils.isNotBlank(projectReportData.getBzshbUserId())){
+                    User user=userService.get(projectReportData.getBzshbUserId());
+                    bzshbConsultant.setZixunyuanName("陈红星("+user.getName()+"代)");
+                    bzshbConsultant.setZixunyuan(user.getId());
+                    bzshbConsultant.setRole("技术负责人");
+                    consultants.add(bzshbConsultant);
+                }
             }
         }
         //展示
@@ -501,7 +503,9 @@ public class RuralProjectViewController extends BaseController {
         }
         //获取总审人员
         User user=UserUtils.get(projectReportData.getBzshbUserId());
-        model.addAttribute("bzshbUserName",user.getName());
+        if(null != user){
+            model.addAttribute("bzshbUserName",user.getName());
+        }
         return "modules/ruralprojectrecords/view/reportView";
     }