Merge remote-tracking branch 'origin/master_saas' into master_saas

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

@@ -1087,6 +1087,9 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         studentRegistration.setUpdateTime(date);
 
         SysUser sysUser = studentRegistrationDao.getSysUserByPhone(studentRegistration.getParentsPhone());
+        if (sysUser !=null && sysUser.getUserType().contains("SCHOOL")) {
+            throw new BizException("用户已存在学校账户");
+        }
         StudentRegistration phoneAndMusicGroupId = null;
         if (sysUser != null) {
             if (!musicGroup.getTenantId().equals(sysUser.getTenantId())) {

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

@@ -1149,6 +1149,9 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
     public <T extends BaseStudentDto> SysUser upSetStudent(T baseStudent) {
         // 判断用户是否存在
         SysUser user = studentDao.getUserByPhone(baseStudent.getPhone());
+        if (user !=null && user.getUserType().contains("SCHOOL")) {
+            throw new BizException("用户已存在学校账户");
+        }
         if (user == null || user.getId() == null) {
             user = new SysUser();
             BeanUtils.copyProperties(baseStudent,user);

mec-biz/src/main/resources/config/mybatis/CooperationOrganMapper.xml

@@ -223,8 +223,5 @@
         FROM cooperation_organ
         WHERE FIND_IN_SET(organ_id_, #{organId})
           AND del_flag_ != 1
-        <if test="enable != null">
-            AND is_enable_ = #{enable}
-        </if>
     </select>
 </mapper>

mec-websocket/src/main/java/com/ym/mec/web/handler/WhiteboardHandler.java

@@ -98,7 +98,7 @@ public class WhiteboardHandler {
             pubSubStore.publish(PubSubType.DISPATCH, new DispatchMessage(roomId, packet, namespace));
 
             log.info("dispatchMessage SYNC_MESSAGE roomId={}, sid={}, eventName={}, ns={}, addr={}", roomId, client.getSessionId(), eventName,
-                    client.getNamespace(), client.getRemoteAddress());
+                    client.getNamespace().getName(), client.getRemoteAddress());
         } catch (Exception e) {
             log.error("PubSubType.DISPATCH roomId={}, sid={}", roomId, client.getSessionId(), e);
         }
@@ -248,7 +248,7 @@ public class WhiteboardHandler {
      */
     @OnEvent(value = EVENT_SERVER_BROADCAST)
     public void serverBroadcast(SocketIOClient client, String roomId, byte[] encryptedData, byte[] iv) {
-        log.info("serverBroadcast SYNC_MESSAGE roomId={}, ns={}, sessionId={}, addr={}", roomId, client.getNamespace(),
+        log.info("serverBroadcast SYNC_MESSAGE roomId={}, ns={}, sessionId={}, addr={}", roomId, client.getNamespace().getName(),
                 client.getSessionId(), client.getRemoteAddress());
 
         BroadcastOperations roomOperations = namespace.getRoomOperations(roomId);
@@ -268,7 +268,7 @@ public class WhiteboardHandler {
      */
     @OnEvent(value = EVENT_SERVER_VOLATILE_BROADCAST)
     public void serverVolatileBroadcast(SocketIOClient client, String roomId, byte[] encryptedData, byte[] iv) {
-        log.info("serverVolatileBroadcast SYNC_MESSAGE roomId={}, ns={}, sessionId={}, addr={}", roomId, client.getNamespace(),
+        log.info("serverVolatileBroadcast SYNC_MESSAGE roomId={}, ns={}, sessionId={}, addr={}", roomId, client.getNamespace().getName(),
                 client.getSessionId(), client.getRemoteAddress());
 
         BroadcastOperations roomOperations = namespace.getRoomOperations(roomId);