diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/DataSetBasicFileController.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/DataSetBasicFileController.java
index 8967fcb..4c98700 100644
--- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/DataSetBasicFileController.java
+++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/DataSetBasicFileController.java
@@ -11,7 +11,6 @@ import com.bonus.common.core.web.page.TableDataInfo;
import com.bonus.common.log.annotation.SysLog;
import com.bonus.common.log.enums.OperaType;
import com.bonus.common.security.annotation.RequiresPermissions;
-import org.aspectj.weaver.loadtime.Aj;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/DataSetBasicFileServiceImpl.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/DataSetBasicFileServiceImpl.java
index e04dd12..f58dd87 100644
--- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/DataSetBasicFileServiceImpl.java
+++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/DataSetBasicFileServiceImpl.java
@@ -282,7 +282,7 @@ public class DataSetBasicFileServiceImpl implements DataSetBasicFileService {
dataSetBasicFileMapper.updateSharedFilesByIds(isPublic,entity.getIsPublic());
}
}
- return null;
+ return AjaxResult.success();
}
/**
diff --git a/bonus-modules/bonus-ai/src/main/resources/mapper/DataSetBasicFileMapper.xml b/bonus-modules/bonus-ai/src/main/resources/mapper/DataSetBasicFileMapper.xml
index abeb803..e479542 100644
--- a/bonus-modules/bonus-ai/src/main/resources/mapper/DataSetBasicFileMapper.xml
+++ b/bonus-modules/bonus-ai/src/main/resources/mapper/DataSetBasicFileMapper.xml
@@ -20,44 +20,51 @@
- select file_id, parent_id, ancestors, file_name, file_url, file_size, file_last_modifytime, upload_time, is_directory, is_public, del_flag, create_by, create_time, update_by, update_time from ai_basic_file
+ select abf.file_id, abf.parent_id, abf.ancestors, abf.file_name, abf.file_url,
+ abf.file_size, abf.file_last_modifytime, abf.upload_time, abf.is_directory, abf.is_public,
+ abf.del_flag, su.user_name AS create_by , abf.create_time, abf.update_by, abf.update_time
+ from ai_basic_file abf
+ LEFT JOIN sys_user su ON abf.create_by = su.user_id
+
@@ -132,14 +139,14 @@
- update ai_basic_file set del_flag='0' where file_id in
+ update ai_basic_file set del_flag='0' where file_id in
#{fileId}
- update ai_basic_file set del_flag='1' where file_id in
+ update ai_basic_file set del_flag='1' , update_time = now() where file_id in
#{fileId}
diff --git a/bonus-modules/bonus-ai/src/main/resources/mapper/DataSetTeamMemberMapper.xml b/bonus-modules/bonus-ai/src/main/resources/mapper/DataSetTeamMemberMapper.xml
index 4cb37aa..f290782 100644
--- a/bonus-modules/bonus-ai/src/main/resources/mapper/DataSetTeamMemberMapper.xml
+++ b/bonus-modules/bonus-ai/src/main/resources/mapper/DataSetTeamMemberMapper.xml
@@ -27,7 +27,7 @@
AT.del_flag='0'
and su.nick_name like concat('%', #{userName}, '%')
- and AT.role_id = #{roleId}
+ and AT.role_id like concat('%', #{roleId}, '%')
and su.sex = #{sex}
ORDER BY AT.create_time DESC