推送

module_kzks/src/main/java/org/jeecg/modules/projectPushList/service/impl/ProjectPushListServiceImpl.java

@@ -88,12 +88,13 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
                 List<String> roleIds = Arrays.asList(set.getPushTo().split(","));
                 List<UserNameIDVO> userNameIdList = this.userNamesByRoleIds(roleIds);
 
-                for (UserNameIDVO vo: userNameIdList){
-                    //根据用户id查其所属部门的部门编码
-                    List<String> sysOrgCodeList = this.selectDeptCodeByUserId(vo.getUserId());
-                    String sysOrgCodes = sysOrgCodeList.stream().collect(Collectors.joining(","));
+                for (ProjectCost cost:projectCostList1){
+                    for (UserNameIDVO vo: userNameIdList){
+                        //根据用户id查其所属部门的部门编码
+                        List<String> sysOrgCodeList = this.selectDeptCodeByUserId(vo.getUserId());
+                        String sysOrgCodes = sysOrgCodeList.stream().collect(Collectors.joining(","));
 
-                    for (ProjectCost cost:projectCostList1){
+                        //组推送对象
                         ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
                                 cost.getTaskno(),cost.getTaskname(),set.getId(), vo.getUsername(), set.getContent(),sysOrgCodes);
                         pushList.add(push);
@@ -115,12 +116,13 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
                 List<String> roleIds = Arrays.asList(set.getPushTo().split(","));
                 List<UserNameIDVO> userNameIdList = this.userNamesByRoleIds(roleIds);
 
-                for (UserNameIDVO vo: userNameIdList){
-                    //根据用户id查其所属部门的部门编码
-                    List<String> sysOrgCodeList = this.selectDeptCodeByUserId(vo.getUserId());
-                    String sysOrgCodes = sysOrgCodeList.stream().collect(Collectors.joining(","));
+                for (ProjectCost cost:projectCostList1){
+                    for (UserNameIDVO vo: userNameIdList){
+                        //根据用户id查其所属部门的部门编码
+                        List<String> sysOrgCodeList = this.selectDeptCodeByUserId(vo.getUserId());
+                        String sysOrgCodes = sysOrgCodeList.stream().collect(Collectors.joining(","));
 
-                    for (ProjectCost cost:projectCostList1){
+                        //组推送对象
                         ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
                                 cost.getTaskno(),cost.getTaskname(),set.getId(), vo.getUsername(), set.getContent(),sysOrgCodes);
                         pushList.add(push);
@@ -140,12 +142,13 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
                 List<String> roleIds = Arrays.asList(set.getPushTo().split(","));
                 List<UserNameIDVO> userNameIdList = this.userNamesByRoleIds(roleIds);
 
-                for (UserNameIDVO vo: userNameIdList){
-                    //根据用户id查其所属部门的部门编码
-                    List<String> sysOrgCodeList = this.selectDeptCodeByUserId(vo.getUserId());
-                    String sysOrgCodes = sysOrgCodeList.stream().collect(Collectors.joining(","));
+                for (ProjectCost cost:projectCostList1){
+                    for (UserNameIDVO vo: userNameIdList){
+                        //根据用户id查其所属部门的部门编码
+                        List<String> sysOrgCodeList = this.selectDeptCodeByUserId(vo.getUserId());
+                        String sysOrgCodes = sysOrgCodeList.stream().collect(Collectors.joining(","));
 
-                    for (ProjectCost cost:projectCostList1){
+                        //组推送对象
                         ProjectPushList push = ProjectPushListConvert.INSTANCE.toProjectPushList(
                                 cost.getTaskno(),cost.getTaskname(),set.getId(), vo.getUsername(), set.getContent(),sysOrgCodes);
                         pushList.add(push);