Merge remote-tracking branch 'origin/main'

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<MultipartFile> files, HttpServletRequest request
+    public R uploadFile(@RequestParam("files") MultipartFile[] files, HttpServletRequest request
     ) {
         return ossService.uploadFileList(files);
     }

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<MultipartFile> files);
+    R uploadFileList(MultipartFile[] files);
 
     R deleteFile(String path);
 }

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<MultipartFile> files) {
+    public R uploadFileList(MultipartFile[] files) {
         List<String> list = new ArrayList<>();
         try {
             //4、 创建OSSClient实例。

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
         <where>
             <if test="userId != null "> and a.user_id = #{userId}</if>
-            <if test="username != null "> and u.username like concat('%',#{username},'%')</if>
+            <if test="username != null "> and
+                                    (u.username like concat('%',#{username},'%')
+                                        or a.content like concat('%',#{username},'%')
+                                        )
+            </if>
             <if test="content != null  and content != ''"> and a.content like concat('%',#{content},'%')</if>
             <if test="videoUrl != null  and videoUrl != ''"> and a.video_url = #{videoUrl}</if>
             <if test="topicId != null "> and a.topic_id like concat('%',#{topicId},'%')</if>

gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml

@@ -181,7 +181,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="isMember != null "> and a.is_member = #{isMember}</if>
         <if test="appId != null "> and a.id != #{appId}</if>
         <if test="school != null  and school != ''"> and a.school = #{school}</if>
-        <if test="companyName != null  and companyName != ''"> and a.company_name like concat('%', #{companyName}, '%')</if>
+        <if test="companyName != null  and companyName != ''">
+            and (a.company_name like concat('%', #{companyName}, '%')
+                or a.username like concat('%', #{companyName}, '%')
+                or s.name like concat('%', #{companyName}, '%')
+            )
+        </if>
         <if test="ids != null and ids.size()"> and a.id not in
             <foreach collection="ids" item="item" open="(" separator="," close=")">
                 #{item}
@@ -202,7 +207,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from app_user a
         <where>
             a.is_member = 0
-            and a.order_end_time &gt; now()
+            and now() &gt; a.order_end_time
         </where>
     </select>