fix:修复设备绑定默认问题

fix:修复设备删除后再次进行连接时数据错误问题

Author: joey-zhou

src/main/java/com/xiaozhi/communication/common/MessageHandler.java

@@ -97,7 +97,7 @@ public void afterConnection(ChatSession chatSession, String deviceIdAuth) {
         device.setSessionId(sessionId);
         sessionManager.registerDevice(sessionId, device);
         // 如果已绑定，则初始化其他内容
-        if (!ObjectUtils.isEmpty(device)) {
+        if (!ObjectUtils.isEmpty(device) && device.getRoleId() != null) {
             //这里需要放在虚拟线程外
             ToolsSessionHolder toolsSessionHolder = new ToolsSessionHolder(chatSession.getSessionId(),
                     device, toolsGlobalRegistry);

src/main/java/com/xiaozhi/service/impl/SysDeviceServiceImpl.java

@@ -88,7 +88,7 @@ public int add(SysDevice device) throws NotFoundException {
             // 优先绑定默认角色，否则随便绑定一个
             for (SysRole role: roles) {
                 device.setRoleId(role.getRoleId());
-                if (role.getIsDefault() == "1") {
+                if (role.getIsDefault().equals("1")) {
                     break;
                 }
             }