Merge remote-tracking branch 'origin/master'

web/src/main/java/com/jpsoft/shinestar/modules/workflow/ProcessActivityController.java

@@ -156,7 +156,13 @@ public class ProcessActivityController {
                         }
                     }
                     else{
-                        approvedPersonIdList.add(processActUser.getPersonId());
+                        if(StringUtils.isNotEmpty(processActUser.getPersonId())){
+                            PersonInfo personInfo = personInfoService.get(Long.parseLong(processActUser.getPersonId()));
+                            if(personInfo!=null&&!personInfo.getDelFlag()){
+                                approvedPersonIdList.add(processActUser.getPersonId());
+                            }
+                        }
+
                     }
                     source = processActUser.getSource();
                 }