楚江ERP:撤销单-部分人员收不到消息bug修改

@@ -153,7 +153,7 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
                 handlePurchaseOrderData(flowStatus, businessId);
                 handlePurchaseOrderData(flowStatus, businessId);
                 break;
                 break;
             case "ORDER_CANCELLATION":
             case "ORDER_CANCELLATION":
-                handlePurchaseOrderRevokeData(flowStatus, businessId);
+                handlePurchaseOrderRevokeData(flowStatus, businessId, variable);
                 break;
                 break;
             case "SPEC_CHANGE_SUBMIT":
             case "SPEC_CHANGE_SUBMIT":
             case "SPEC_CHANGE_CONFIRM":
             case "SPEC_CHANGE_CONFIRM":
@@ -268,7 +268,7 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
      *
      *
      * @param businessId 业务ID
      * @param businessId 业务ID
      */
      */
-    private void handlePurchaseOrderRevokeData(String flowStatus, String businessId) {
+    private void handlePurchaseOrderRevokeData(String flowStatus, String businessId, Map<String, Object> variable) {
         if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)
         if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)
                 || FlowInstanceStatus.FINISH.getCode().equals(flowStatus)) {
                 || FlowInstanceStatus.FINISH.getCode().equals(flowStatus)) {
             purchaseOrderRevokeService.updateStatus(businessId, "PASS");
             purchaseOrderRevokeService.updateStatus(businessId, "PASS");
@@ -335,24 +335,62 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
             if (CollectionUtils.isNotEmpty(list2)) {
             if (CollectionUtils.isNotEmpty(list2)) {
                 userIdList.addAll(list2);
                 userIdList.addAll(list2);
             }
             }
-            //经营办计划员
-            List<String> list3 = transactorHandler.listTransactorsByRoleCode("jybjhy", createById);
+            Object o = variable.get("workshopCode");
+            List<String> list3 = new ArrayList<>();
+            List<String> list4 = new ArrayList<>();
+            List<String> list5 = new ArrayList<>();
+            List<String> list6 = new ArrayList<>();
+            if (o != null) {
+                String workshopCode = String.valueOf(o);
+                if ("yfc".equals(workshopCode)) {
+                    //一分厂经营办计划员
+                    list3 = transactorHandler.listTransactorsByRoleCode("yfcjybjhy", createById);
+                    //一分厂经营办主管
+                    list4 = transactorHandler.listTransactorsByRoleCode("yfcjybzg", createById);
+                    //一分厂生产科计划员
+                    list5 = transactorHandler.listTransactorsByRoleCode("yfcsckjhy", createById);
+                    //一分营销管理科统计员
+                    list6 = transactorHandler.listTransactorsByRoleCode("yfcyxglktjy", createById);
+                } else if ("efc".equals(workshopCode)) {
+                    //二分厂经营办计划员
+                    list3 = transactorHandler.listTransactorsByRoleCode("efcjybjhy", createById);
+                    //二分厂经营办主管
+                    list4 = transactorHandler.listTransactorsByRoleCode("efcjybzg", createById);
+                    //二分厂生产科计划员
+                    list5 = transactorHandler.listTransactorsByRoleCode("efcsckjhy", createById);
+                    //二分营销管理科统计员
+                    list6 = transactorHandler.listTransactorsByRoleCode("efcyxglktjy", createById);
+                } else if ("sfc".equals(workshopCode)) {
+                    //三分厂经营办计划员
+                    list3 = transactorHandler.listTransactorsByRoleCode("sfcjybjhy", createById);
+                    //三分厂经营办主管
+                    list4 = transactorHandler.listTransactorsByRoleCode("sfcjybzg", createById);
+                    //三分厂生产科计划员
+                    list5 = transactorHandler.listTransactorsByRoleCode("sfcsckjhy", createById);
+                    //三分营销管理科统计员
+                    list6 = transactorHandler.listTransactorsByRoleCode("sfcyxglktjy", createById);
+                } else if ("ztfc".equals(workshopCode)) {
+                    //四分厂经营办计划员
+                    list3 = transactorHandler.listTransactorsByRoleCode("ztfcjybjhy", createById);
+                    //四分厂经营办主管
+                    list4 = transactorHandler.listTransactorsByRoleCode("ztfcjybzg", createById);
+                    //四分厂生产科计划员
+                    list5 = transactorHandler.listTransactorsByRoleCode("ztfcsckjhy", createById);
+                    //四分营销管理科统计员
+                    list6 = transactorHandler.listTransactorsByRoleCode("ztfcyxglktjy", createById);
+                }
+
+            }
+
             if (CollectionUtils.isNotEmpty(list3)) {
             if (CollectionUtils.isNotEmpty(list3)) {
                 userIdList.addAll(list3);
                 userIdList.addAll(list3);
             }
             }
-            //经营办主管
-            List<String> list4 = transactorHandler.listTransactorsByRoleCode("jybzg", createById);
             if (CollectionUtils.isNotEmpty(list4)) {
             if (CollectionUtils.isNotEmpty(list4)) {
                 userIdList.addAll(list4);
                 userIdList.addAll(list4);
             }
             }
-            //生产科计划员
-            List<String> list5 = transactorHandler.listTransactorsByRoleCode("sckjhy", createById);
             if (CollectionUtils.isNotEmpty(list5)) {
             if (CollectionUtils.isNotEmpty(list5)) {
                 userIdList.addAll(list5);
                 userIdList.addAll(list5);
             }
             }
-            //
-            //营销管理科统计员
-            List<String> list6 = transactorHandler.listTransactorsByRoleCode("yxglktjy", createById);
             if (CollectionUtils.isNotEmpty(list6)) {
             if (CollectionUtils.isNotEmpty(list6)) {
                 userIdList.addAll(list6);
                 userIdList.addAll(list6);
             }
             }