update

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -164,10 +164,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if(musicGroup.getStatus() == MusicGroupStatusEnum.AUDIT){
             Set<Integer> roleIds = new HashSet<>(1);
             roleIds.add(SysUserRole.SECTION_MANAGER);
-            String[] organIds = null;
-            if(StringUtils.isNotEmpty(sysUser.getOrganId())){
-                organIds = sysUser.getOrganId().split(",");
-            }
+
+    		String[] organIds = { musicGroup.getOrganId() + "" };
             sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds,organIds),MessageTypeEnum.BACKSTAGE_CREATE_MUSIC_GROUP_APPLY,"",sysUser.getUsername());
         }
         // 保存乐团付费主体列表
@@ -605,10 +603,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         roleIds.add(SysUserRole.OPERATION_EXECUTIVE);
         roleIds.add(SysUserRole.ADMISSIONS_DIRECTOR);
         roleIds.add(SysUserRole.DEAN_OF_STUDIES);
-        String[] organIds = null;
-        if(StringUtils.isNotEmpty(sysUser.getOrganId())){
-            organIds = sysUser.getOrganId().split(",");
-        }
+
+		String[] organIds = { musicGroup.getOrganId() + "" };
         sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds,organIds),MessageTypeEnum.BACKSTAGE_ACTION_GROUP,"1",musicGroup.getName());
     }
 
@@ -639,10 +635,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         musicGroupDao.update(musicGroup);
         Set<Integer> roleIds = new HashSet<>(1);
         roleIds.add(SysUserRole.SECTION_MANAGER);
-        String[] organIds = null;
-        if(StringUtils.isNotEmpty(sysUser.getOrganId())){
-            organIds = sysUser.getOrganId().split(",");
-        }
+
+		String[] organIds = { musicGroup.getOrganId() + "" };
         sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds,organIds),MessageTypeEnum.BACKSTAGE_CREATE_MUSIC_GROUP_APPLY,"",sysUser.getUsername());
     }
 
@@ -677,10 +671,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         roleIds.add(SysUserRole.EDUCATIONAL_TEACHER);
         roleIds.add(SysUserRole.OPERATION_EXECUTIVE);
         roleIds.add(SysUserRole.ADMISSIONS_DIRECTOR);
-        String[] organIds = null;
-        if(StringUtils.isNotEmpty(sysUser.getOrganId())){
-            organIds = sysUser.getOrganId().split(",");
-        }
+
+		String[] organIds = { musicGroup.getOrganId() + "" };
         sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds,organIds),MessageTypeEnum.BACKSTAGE_ACTION_APPLY,"",musicGroup.getName());
     }
 
@@ -779,10 +771,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         Set<Integer> roleIds = new HashSet<>(2);
         roleIds.add(SysUserRole.SECTION_MANAGER);
         roleIds.add(SysUserRole.OPERATION_EXECUTIVE);
-        String[] organIds = null;
-        if(StringUtils.isNotEmpty(sysUser.getOrganId())){
-            organIds = sysUser.getOrganId().split(",");
-        }
+
+		String[] organIds = { musicGroup.getOrganId() + "" };
         sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds,organIds),MessageTypeEnum.BACKSTAGE_MUSIC_GROUP_STOP,"1",musicGroup.getName());
         return true;
     }
@@ -869,10 +859,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         roleIds.add(SysUserRole.EDUCATIONAL_TEACHER);
         roleIds.add(SysUserRole.OPERATION_EXECUTIVE);
         roleIds.add(SysUserRole.ADMISSIONS_DIRECTOR);
-        String[] organIds = null;
-        if(StringUtils.isNotEmpty(sysUser.getOrganId())){
-            organIds = sysUser.getOrganId().split(",");
-        }
+
+		String[] organIds = { musicGroup.getOrganId() + "" };
         sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds,organIds),MessageTypeEnum.BACKSTAGE_LENGTHEN_PAYMENT,"",musicGroup.getName());
         return true;
     }
@@ -902,10 +890,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         Map<String,Object> memo = new HashMap<>(2);
         memo.put("Id",musicGroupQuit.getId());
         memo.put("type","MUSICGROUP");
-        String[] organIds = null;
-        if(StringUtils.isNotEmpty(sysUser.getOrganId())){
-            organIds = sysUser.getOrganId().split(",");
-        }
+
+		String[] organIds = { musicGroup.getOrganId() + "" };
         sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds,organIds),MessageTypeEnum.BACKSTAGE_STUDENT_APPLY_QUIT_GROUP,JSONObject.toJSONString(memo),sysUser.getUsername());
         return true;
     }
@@ -1280,10 +1266,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         MusicGroup musicGroup = musicGroupDao.get(classGroupDao.findByCourseSchedule(courseScheduleId.intValue()).getMusicGroupId());
         Set<Integer> roleIds = new HashSet<>(1);
         roleIds.add(SysUserRole.SECTION_MANAGER);
-        String[] organIds = null;
-        if(StringUtils.isNotEmpty(sysUser.getOrganId())){
-            organIds = sysUser.getOrganId().split(",");
-        }
+
+		String[] organIds = { musicGroup.getOrganId() + "" };
         sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds,organIds),MessageTypeEnum.BACKSTAGE_TEACHER_AMOUNT_CHANGE,"",
                 teacher.getRealName(),musicGroup.getName(),scope.equals("all")?"所有":"本次");
         return true;
@@ -1481,11 +1465,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         Set<Integer> roleIds = new HashSet<>(3);
         roleIds.add(SysUserRole.SECTION_MANAGER);
         roleIds.add(SysUserRole.EDUCATIONAL_TEACHER);
-        roleIds.add(SysUserRole.OPERATION_EXECUTIVE);
-        String[] organIds = null;
-        if(StringUtils.isNotEmpty(sysUser.getOrganId())){
-            organIds = sysUser.getOrganId().split(",");
-        }
+		roleIds.add(SysUserRole.OPERATION_EXECUTIVE);
+		String[] organIds = { musicGroup.getOrganId() + "" };
         sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds,organIds),MessageTypeEnum.BACKSTAGE_ACTION_PAYMENT,"",musicGroup.getName());
         return musicGroup;
     }
@@ -1559,10 +1540,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 		}
         Set<Integer> roleIds = new HashSet<>(1);
         roleIds.add(SysUserRole.SECTION_MANAGER);
-        String[] organIds = null;
-        if(StringUtils.isNotEmpty(sysUser.getOrganId())){
-            organIds = sysUser.getOrganId().split(",");
-        }
+
+		String[] organIds = { musicGroup.getOrganId() + "" };
         sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds,organIds),MessageTypeEnum.BACKSTAGE_MUSIC_GROUP_MARKING,"",musicGroup.getName());
     }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRegistrationServiceImpl.java

@@ -132,10 +132,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             Set<Integer> roleIds = new HashSet<>(2);
             roleIds.add(SysUserRole.SECTION_MANAGER);
             roleIds.add(SysUserRole.OPERATION_EXECUTIVE);
-            String[] organIds = null;
-            if(StringUtils.isNotEmpty(sysUser.getOrganId())){
-                organIds = sysUser.getOrganId().split(",");
-            }
+
+    		String[] organIds = { musicGroup.getOrganId() + "" };
             sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds,organIds), MessageTypeEnum.BACKSTAGE_STUDENT_SUBJECT_CHANGE, "", musicGroup.getName());
         }
         return i;
@@ -474,10 +472,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
             Set<Integer> roleIds = new HashSet<>(1);
             roleIds.add(SysUserRole.OPERATION_EXECUTIVE);
-            String[] organIds = null;
-            if(StringUtils.isNotEmpty(studentRegistration.getOrganId())){
-                organIds = studentRegistration.getOrganId().split(",");
-            }
+
+    		String[] organIds = { musicGroup.getOrganId() + "" };
             sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds,organIds), MessageTypeEnum.BACKSTAGE_MUSIC_GROUP_ADD_STUDENT, "", musicGroup.getName(), studentRegistration.getName());
             //增加报名学生数
             musicGroupSubjectPlanService.addApplyStudentNum(musicGroupId, studentRegistration.getSubjectId(), 1);