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

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/ApiTokenService.java

@@ -7,6 +7,7 @@ import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 
+import cn.hutool.core.util.ObjectUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -85,7 +86,10 @@ public class ApiTokenService {
      */
     public void forcedLogoutByMobile(String mobile) {
         // 获取护工对应的用户id
-        User user = userService.loadByMobile(mobile, true);
+        User user = userService.loadByMobile(mobile, false);
+        if (ObjectUtil.isNull(user)) {
+            return;
+        }
         Set<String> tokens = stringRedisTemplate.opsForSet().members(Constants.JWT_ONLINE_USER_TOKEN + user.getId());
         if (CollUtil.isNotEmpty(tokens)) {
             for (String token : tokens) {

ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/operating/service/impl/OperatingPhoneServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import cn.hutool.core.collection.CollUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -163,8 +164,10 @@ public class OperatingPhoneServiceImpl implements IOperatingPhoneService {
 
         // 删除
         List<OperatingPhone> operatingPhoneList = baseMapper.selectList();
-        Set<Long> ids = operatingPhoneList.stream().map(OperatingPhone::getId).collect(Collectors.toSet());
-        baseMapper.deleteBatchIds(ids);
+        if (CollUtil.isNotEmpty(operatingPhoneList)) {
+            Set<Long> ids = operatingPhoneList.stream().map(OperatingPhone::getId).collect(Collectors.toSet());
+            baseMapper.deleteBatchIds(ids);
+        }
 
         // 新增
         List<OperatingPhone> saveList = BeanCopyUtils.copyList(boList, OperatingPhone.class);