优化 工作流程设置问题

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

@@ -115,6 +115,13 @@ public class UpdateWorkflowListener extends AbstractServiceApiPlusListener {
     @Override
     protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
 
+        if (reqJson.containsKey("flowType")) {
+            String flowType = reqJson.getString("flowType");
+            if (WorkflowDto.FLOW_TYPE_PURCHASE.equals(flowType) || WorkflowDto.FLOW_TYPE_COLLECTION.equals(flowType)) {
+                reqJson.put("communityId", reqJson.getString("communityId"));
+            }
+        }
+
         WorkflowStepDto workflowStepDto = new WorkflowStepDto();
         workflowStepDto.setFlowId(reqJson.getString("flowId"));
         workflowStepDto.setCommunityId(reqJson.getString("communityId"));

service-common/src/main/java/com/java110/common/api/WorkflowApi.java

@@ -1,7 +1,6 @@
 package com.java110.common.api;
 
 import com.java110.common.bmo.workflow.IQueryWorkFlowFirstStaffBMO;
-import com.java110.dto.user.StaffDto;
 import com.java110.dto.workflow.WorkflowDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -19,10 +18,12 @@ public class WorkflowApi {
 
     @RequestMapping(value = "/getFirstStaff", method = RequestMethod.GET)
     public ResponseEntity<String> getFirstStaff(@RequestParam(name = "flowType") String flowType,
-                                        @RequestParam(name = "communityId") String communityId) {
+                                                @RequestParam(name = "communityId") String communityId,
+                                                @RequestParam(name = "storeId") String storeId) {
         WorkflowDto workflowDto = new WorkflowDto();
         workflowDto.setCommunityId(communityId);
         workflowDto.setFlowType(flowType);
+        workflowDto.setStoreId(storeId);
         return queryWorkFlowFirstStaffBMOImpl.query(workflowDto);
     }
 }

service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java

@@ -48,6 +48,7 @@ public class QueryWorkFlowFirstStaffBMOImpl implements IQueryWorkFlowFirstStaffB
         param.put("flowId", tmpWorkflowDto.getFlowId());
         param.put("seq", "1");
         param.put("communityId", tmpWorkflowDto.getCommunityId());
+        param.put("storeId", tmpWorkflowDto.getStoreId());
         //查询步骤
         List<Map> workflowSteps = workflowStepServiceDaoImpl.getWorkflowStepInfo(param);
 
@@ -59,7 +60,7 @@ public class QueryWorkFlowFirstStaffBMOImpl implements IQueryWorkFlowFirstStaffB
         param.put("statusCd", "0");
         param.put("communityId", tmpWorkflowDto.getCommunityId());
         param.put("stepId", workflowSteps.get(0).get("stepId"));
-
+        param.put("storeId", tmpWorkflowDto.getStoreId());
 
         List<Map> workflowStepStaffs = workflowStepStaffServiceDaoImpl.getWorkflowStepStaffInfo(param);