diff --git a/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/service/TokenService.java b/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/service/TokenService.java index 5937ce6..1ecae7b 100644 --- a/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/service/TokenService.java +++ b/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/service/TokenService.java @@ -66,7 +66,7 @@ public class TokenService if (StringUtils.isNotEmpty(existingToken)) { // 删除已有的 token - // delLoginUser(existingToken); + delLoginUser(existingToken); log.info("用户在其他设备上登录"); } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ImportServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ImportServiceImpl.java index 5b4da64..c01da66 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ImportServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ImportServiceImpl.java @@ -477,16 +477,16 @@ public class ImportServiceImpl implements ImportService { beforeName = currentName; folderName = new StringBuilder(); } - if (i == (list.size() - 1)) { - map.put(beforeName, folderName.toString()); - } + if (!"其他文件".equals(fileName.split("/")[_index + 1])) { folderName.append(fileName.split("/")[_index + 1]).append(","); } if (!"人脸照片".equals(fileName.split("/")[_index + 1])) { folderName.append(fileName.split("/")[_index + 1]).append(","); } - + if (i == (list.size() - 1)) { + map.put(beforeName, folderName.toString()); + } // 使用set方法对名称进行过滤 保持namePhoneList数据的唯一性 if (uniqueNames.add(currentName)) { namePhoneList.add(currentName);