优化审核不过

Author: 928255095

service-api/src/main/java/com/java110/api/listener/purchaseApply/AuditApplyOrderListener.java

@@ -74,6 +74,7 @@ protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context,
         Assert.listOnlyOne(purchaseApplyDtos, "采购申请单存在多条");
         purchaseApplyDto.setStartUserId(purchaseApplyDtos.get(0).getUserId());
         purchaseApplyDto.setResOrderType(purchaseApplyDtos.get(0).getResOrderType());
+        purchaseApplyDto.setNextStaffId(reqJson.getString("nextUserId"));
         if (purchaseApplyDtos.get(0).getState().equals(purchaseApplyDto.STATE_WAIT_DEAL) && reqJson.getString("state").equals("1100")) {  //如果状态是未审核 并且是审核通过，就变成审核中
             PurchaseApplyPo purchaseApplyPo = new PurchaseApplyPo();
             purchaseApplyPo.setApplyOrderId(purchaseApplyDtos.get(0).getApplyOrderId());

service-api/src/main/java/com/java110/api/listener/workflow/ListWorkflowAuditInfoListener.java

@@ -12,6 +12,7 @@
 import com.java110.utils.constant.ServiceCodeWorkflowConstant;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
@@ -86,6 +87,9 @@ private void freshUserName(List<WorkflowAuditInfoDto> workflowAuditInfoDtos) {
 
 
         for (WorkflowAuditInfoDto tmpWorkflowAuditInfoDto:workflowAuditInfoDtos ){
+            if(StringUtil.isEmpty(tmpWorkflowAuditInfoDto.getUserId())){
+                continue;
+            }
             for(UserDto tmpUserDto: userDtos){
                 if (tmpWorkflowAuditInfoDto.getUserId().equals(tmpUserDto.getUserId())){
                     tmpWorkflowAuditInfoDto.setUserName(tmpUserDto.getUserName());