Merge branch 'dev' of git.xmmakeit.com:huangjiay/iot-platform-server into dev

server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java

@@ -119,6 +119,9 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
             return new PageVO<>();
         }
         String elderId = platElderChildrenInfo.getElderId();
+        if(StringUtils.isBlank(elderId)){
+            return new PageVO<>();
+        }
         String[] split = elderId.split(",");
         PlatAlarmRecordQueryDTO data = dto.getData();
         data.setElderIdList(Arrays.asList(split));

server-service/src/main/java/com/makeit/service/saas/impl/PlatTenantServiceImpl.java

@@ -434,7 +434,7 @@ public class PlatTenantServiceImpl extends ServiceImpl<PlatTenantMapper, PlatTen
         PlatTenant tntTenant = getOne(
                 new QueryWrapper<PlatTenant>().lambda()
                         .eq(PlatTenant::getCode, dto.getCode())
-                        .ne(StringUtils.isNotBlank(dto.getId()), PlatTenant::getCode, dto.getCode())
+                        .ne(StringUtils.isNotBlank(dto.getId()), PlatTenant::getId, dto.getId())
         );
 
         if (tntTenant != null && !tntTenant.getId().equals(dto.getId())) {