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

@@ -11,6 +11,7 @@ import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.utils.IdUtil;
 import com.lframework.starter.web.core.utils.JsonUtil;
 import com.lframework.starter.web.inner.dto.message.SysSiteMessageDto;
+import com.lframework.starter.web.inner.service.system.SysUserRoleService;
 import com.lframework.xingyun.basedata.entity.Workshop;
 import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import com.lframework.xingyun.sc.entity.*;
@@ -55,6 +56,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Component
 @Slf4j
@@ -107,6 +109,9 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
     private MessageHandler messageHandler;
     @Resource
     private ShipmentsPlanDetailService shipmentsPlanDetailService;
+    @Resource
+    private SysUserRoleService sysUserRoleService;
+
 
 
     /**
@@ -336,64 +341,48 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
                 userIdList.addAll(list2);
             }
             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<>();
+            List<String> roleCodes = new ArrayList<>();
             if (o != null) {
                 String workshopCode = String.valueOf(o);
                 if ("yfc".equals(workshopCode)) {
                     //一分厂经营办计划员
-                    list3 = transactorHandler.listTransactorsByRoleCode("yfcjybjhy", createById);
+                    roleCodes.add("yfcjybjhy");
                     //一分厂经营办主管
-                    list4 = transactorHandler.listTransactorsByRoleCode("yfcjybzg", createById);
+                    roleCodes.add("yfcjybzg");
                     //一分厂生产科计划员
-                    list5 = transactorHandler.listTransactorsByRoleCode("yfcsckjhy", createById);
-                    //一分营销管理科统计员
-                    list6 = transactorHandler.listTransactorsByRoleCode("yfcyxglktjy", createById);
+                    roleCodes.add("yfcsckjhy");
                 } else if ("efc".equals(workshopCode)) {
                     //二分厂经营办计划员
-                    list3 = transactorHandler.listTransactorsByRoleCode("efcjybjhy", createById);
+                    roleCodes.add("efcjybjhy");
                     //二分厂经营办主管
-                    list4 = transactorHandler.listTransactorsByRoleCode("efcjybzg", createById);
+                    roleCodes.add("efcjybzg");
                     //二分厂生产科计划员
-                    list5 = transactorHandler.listTransactorsByRoleCode("efcsckjhy", createById);
-                    //二分营销管理科统计员
-                    list6 = transactorHandler.listTransactorsByRoleCode("efcyxglktjy", createById);
+                    roleCodes.add("efcsckjhy");
                 } else if ("sfc".equals(workshopCode)) {
                     //三分厂经营办计划员
-                    list3 = transactorHandler.listTransactorsByRoleCode("sfcjybjhy", createById);
+                    roleCodes.add("sfcjybjhy");
                     //三分厂经营办主管
-                    list4 = transactorHandler.listTransactorsByRoleCode("sfcjybzg", createById);
+                    roleCodes.add("sfcjybzg");
                     //三分厂生产科计划员
-                    list5 = transactorHandler.listTransactorsByRoleCode("sfcsckjhy", createById);
-                    //三分营销管理科统计员
-                    list6 = transactorHandler.listTransactorsByRoleCode("sfcyxglktjy", createById);
+                    roleCodes.add("sfcsckjhy");
                 } else if ("ztfc".equals(workshopCode)) {
                     //四分厂经营办计划员
-                    list3 = transactorHandler.listTransactorsByRoleCode("ztfcjybjhy", createById);
+                    roleCodes.add("ztfcjybjhy");
                     //四分厂经营办主管
-                    list4 = transactorHandler.listTransactorsByRoleCode("ztfcjybzg", createById);
+                    roleCodes.add("ztfcjybzg");
                     //四分厂生产科计划员
-                    list5 = transactorHandler.listTransactorsByRoleCode("ztfcsckjhy", createById);
-                    //四分营销管理科统计员
-                    list6 = transactorHandler.listTransactorsByRoleCode("ztfcyxglktjy", createById);
+                    roleCodes.add("ztfcsckjhy");;
                 }
-
             }
+            //营销管理科统计员
+            roleCodes.add("yxglktjy");
 
-            if (CollectionUtils.isNotEmpty(list3)) {
-                userIdList.addAll(list3);
-            }
-            if (CollectionUtils.isNotEmpty(list4)) {
-                userIdList.addAll(list4);
-            }
-            if (CollectionUtils.isNotEmpty(list5)) {
-                userIdList.addAll(list5);
-            }
-            if (CollectionUtils.isNotEmpty(list6)) {
-                userIdList.addAll(list6);
-            }
+            // 获取角色下人员ID
+            List<String> userIds = sysUserRoleService.listUserIdByRoleCodes(roleCodes);
+
+            userIdList.addAll(userIds);
+            //去重
+            userIdList = userIdList.stream().distinct().collect(Collectors.toList());
             SysSiteMessageDto messageDto = new SysSiteMessageDto();
             messageDto.setUserIdList(userIdList);
             messageDto.setTitle("订货单撤销通过通知");