From 2ad7ca1078d221b6690467d8c6002b68a5a0b673 Mon Sep 17 00:00:00 2001 From: linhw <5331581+linhw11@user.noreply.gitee.com> Date: Wed, 22 May 2024 18:22:21 +0800 Subject: [PATCH 1/4] ~ --- .../src/main/resources/mapper/app/AppUserDynamicMapper.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserDynamicMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserDynamicMapper.xml index 8de7b0c..1a9f51f 100644 --- a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserDynamicMapper.xml +++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserDynamicMapper.xml @@ -64,7 +64,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join app_town t on t.id = a.town_id and a.user_id = #{userId} - and u.username like concat('%',#{username},'%') + and + (u.username like concat('%',#{username},'%') + or a.content like concat('%',#{username},'%') + ) + and a.content like concat('%',#{content},'%') and a.video_url = #{videoUrl} and a.topic_id like concat('%',#{topicId},'%') From 6b4b11729c16349308a7b3bb48f4f3c2421e0469 Mon Sep 17 00:00:00 2001 From: linhw <5331581+linhw11@user.noreply.gitee.com> Date: Wed, 22 May 2024 18:26:40 +0800 Subject: [PATCH 2/4] ~ --- .../src/main/java/com/ruoyi/app/controller/OssController.java | 2 +- .../src/main/java/com/ruoyi/app/service/OssService.java | 2 +- .../main/java/com/ruoyi/app/service/impl/OssServiceImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/OssController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/OssController.java index 8913ec6..356ffd4 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/OssController.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/OssController.java @@ -29,7 +29,7 @@ public class OssController { @PostMapping("uploadList") @ApiOperation(value = "上传文件" , notes = "上传文件", produces = "file" , response = R.class) - public R uploadFile(@RequestBody List files, HttpServletRequest request + public R uploadFile(@RequestParam("files") MultipartFile[] files, HttpServletRequest request ) { return ossService.uploadFileList(files); } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/OssService.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/OssService.java index 51dbc08..7618aae 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/OssService.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/OssService.java @@ -10,7 +10,7 @@ import java.util.List; public interface OssService { R uploadFile(MultipartFile file); - R uploadFileList(List files); + R uploadFileList(MultipartFile[] files); R deleteFile(String path); } \ No newline at end of file diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/OssServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/OssServiceImpl.java index cb89cf9..310bee3 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/OssServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/OssServiceImpl.java @@ -51,7 +51,7 @@ public class OssServiceImpl implements OssService { } @Override - public R uploadFileList(List files) { + public R uploadFileList(MultipartFile[] files) { List list = new ArrayList<>(); try { //4、 创建OSSClient实例。 From 5ff0814995b2c1c2adf476c0b96e7e5b93017063 Mon Sep 17 00:00:00 2001 From: linhw <5331581+linhw11@user.noreply.gitee.com> Date: Thu, 23 May 2024 10:08:33 +0800 Subject: [PATCH 3/4] ~C --- .../src/main/resources/mapper/app/AppUserMapper.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml index 77df4aa..95c5f21 100644 --- a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml +++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml @@ -181,7 +181,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.is_member = #{isMember} and a.id != #{appId} and a.school = #{school} - and a.company_name like concat('%', #{companyName}, '%') + + and (a.company_name like concat('%', #{companyName}, '%') + or a.username like concat('%', #{companyName}, '%') + or s.name like concat('%', #{companyName}, '%') + ) + and a.id not in #{item} From fc2779822e4a853b9ec578ffcb16419177857783 Mon Sep 17 00:00:00 2001 From: linhw <5331581+linhw11@user.noreply.gitee.com> Date: Thu, 23 May 2024 10:25:45 +0800 Subject: [PATCH 4/4] ~C --- .../ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml index 95c5f21..fe42d26 100644 --- a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml +++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml @@ -207,7 +207,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from app_user a a.is_member = 0 - and a.order_end_time > now() + and now() > a.order_end_time