Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageNewService.java

@@ -847,6 +847,10 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         //添加审核通过日期
         projectReportData.setAuditPassDate(new Date());
         projectReportData.setStatus("5");
+        if (StringUtils.isBlank(projectReportData.getId())){
+            projectReportData.preInsert();
+            projectReportDataDao.insert(projectReportData);
+        }
         projectReportDataDao.update(projectReportData);
     }
 
@@ -2606,7 +2610,9 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
 
         //查询总审人员信息（新增报告选择得总审人员）
         List<User> bzshbs = new ArrayList<>();
-        User bzshbsUser = UserUtils.get(reportData.getBzshbUserId());
+        //查询总审人员Id
+        String bzshbUserId = userDao.getAuditUserListByBzshbUserId(reportData.getBzshbUserId());
+        User bzshbsUser = UserUtils.get(bzshbUserId);
         if(null != bzshbsUser){
             bzshbs.add(bzshbsUser);
         }else if(null == bzshbsUser){