From 8567b31b38b222426468d1d677fea9cf915fb90e Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 16 九月 2022 10:51:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlatformFileService.java | 14 ++++++++------
dao/src/main/resources/mapper/PlatformFileMapper.xml | 20 ++++++++++++--------
2 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/dao/src/main/resources/mapper/PlatformFileMapper.xml b/dao/src/main/resources/mapper/PlatformFileMapper.xml
index 773ffeb..cffb504 100644
--- a/dao/src/main/resources/mapper/PlatformFileMapper.xml
+++ b/dao/src/main/resources/mapper/PlatformFileMapper.xml
@@ -24,13 +24,17 @@
*
FROM
platform_file t1
- <where>
- <if test="fileIdList!=null">
- t1.file_id IN
- <foreach collection="fileIdList" open="(" close=")" item="fileId" separator=",">
- #{fileId}
- </foreach>
- </if>
- </where>
+ LEFT JOIN platform_file_user t2 ON t1.file_Id = t2.file_Id
+ WHERE
+ 1 =1
+ <if test="userId!=null">
+ AND
+ t2.user_id = #{userId}
+ </if>
+ <if test="keyword != null and keyword != ''">
+ AND (
+ t1.file_name LIKE CONCAT('%', #{keyword},'%')
+ )
+ </if>
</select>
</mapper>
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlatformFileService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlatformFileService.java
index 74da103..08841ca 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlatformFileService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlatformFileService.java
@@ -93,13 +93,15 @@
if (platformFiles == null && platformFiles.size() == 0) {
throw new BusinessException("鏈壘鍒版枃浠�!");
}
- //鍒犻櫎鍏崇郴
- boolean remove = platformFileUserService.remove(Wrappers.lambdaQuery(PlatformFileUser.class).in(PlatformFileUser::getFileId, param.getFileIds()));
- if (remove) {
- //鍒犻櫎鏂囦欢
- return removeByIds(param.getFileIds());
+
+ //鑾峰彇鍏崇郴
+ List<PlatformFileUser> list = platformFileUserService.list(Wrappers.lambdaQuery(PlatformFileUser.class).in(PlatformFileUser::getFileId, param.getFileIds()));
+ if (!list.isEmpty()) {
+ //鍒犻櫎鍏崇郴
+ platformFileUserService.remove(Wrappers.lambdaQuery(PlatformFileUser.class).in(PlatformFileUser::getFileId, param.getFileIds()));
}
- return false;
+ //鍒犻櫎鏂囦欢
+ return removeByIds(param.getFileIds());
}
--
Gitblit v1.9.3