Merge remote-tracking branch 'origin/master'

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/impl/SubPreNewServiceImpl.java

@@ -222,12 +222,14 @@ public class SubPreNewServiceImpl implements SubPreNewService {
         SubPreNamePheVO subPreNamePheVO = new SubPreNamePheVO();
 
         if (subPreFlowUnit != null) {
-            JUnit jUnit = jUnitDao.findById(subPreFlowUnit.getUnitId());
-            BeanUtils.copyProperties(jUnit, subPreNamePheVO);
-            if (StringUtil.isNotEmpty(subPreFlowUnit.getDepartId())) {
-                JDepart depart = jDepartDao.findById(subPreFlowUnit.getDepartId());
-                subPreNamePheVO.setNameZrr(Optional.ofNullable(depart).orElse(new JDepart()).getNameLead());
-                subPreNamePheVO.setTel(Optional.ofNullable(depart).orElse(new JDepart()).getTel());
+            JUnit jUnit = jUnitService.findById(subPreFlowUnit.getUnitId());
+            if (jUnit!= null) {
+                BeanUtils.copyProperties(jUnit, subPreNamePheVO);
+                if (StringUtil.isNotEmpty(subPreFlowUnit.getDepartId())) {
+                    JDepart depart = jDepartDao.findById(subPreFlowUnit.getDepartId());
+                    subPreNamePheVO.setNameZrr(Optional.ofNullable(depart).orElse(new JDepart()).getNameLead());
+                    subPreNamePheVO.setTel(Optional.ofNullable(depart).orElse(new JDepart()).getTel());
+                }
             }
         }