解决最近发送文件，按文件名称查询的BUG

lzga-modules/lzga-doc/src/main/java/com/jjt/doc/controller/DocShareController.java

@@ -40,9 +40,10 @@ public class DocShareController extends BaseController {
      * 最
      */
     @GetMapping("/send")
-    public TableDataInfo send() {
+    public TableDataInfo send(DocShare docShare) {
         startPage();
-        List<DocShare> list = docShareService.selectDocShareSend(SecurityUtils.getUserId());
+        docShare.setCreateBy(SecurityUtils.getUserId() + "");
+        List<DocShare> list = docShareService.selectDocShareSend(docShare);
         return getDataTable(list);
     }
 

lzga-modules/lzga-doc/src/main/java/com/jjt/doc/mapper/DocShareMapper.java

@@ -62,10 +62,10 @@ public interface DocShareMapper {
     /**
      * 最近发送文件
      *
-     * @param uid 用户ID
+     * @param docShare
      * @return
      */
-    List<DocShare> selectDocShareSend(Long uid);
+    List<DocShare> selectDocShareSend(DocShare docShare);
 
     /**
      * 最近接收文件

lzga-modules/lzga-doc/src/main/java/com/jjt/doc/service/IDocShareService.java

@@ -62,10 +62,10 @@ public interface IDocShareService {
     /**
      * 最近发送文件
      *
-     * @param uid 用户ID
+     * @param docShare 文档查询条件
      * @return
      */
-    List<DocShare> selectDocShareSend(Long uid);
+    List<DocShare> selectDocShareSend(DocShare docShare);
 
     /**
      * 最近接收文件

lzga-modules/lzga-doc/src/main/java/com/jjt/doc/service/impl/DocShareServiceImpl.java

@@ -4,8 +4,6 @@ import java.util.List;
 
 import com.jjt.common.core.utils.DateUtils;
 import com.jjt.common.security.utils.SecurityUtils;
-import com.jjt.doc.domain.DocInfo;
-import com.jjt.doc.domain.DocShareAccepter;
 import com.jjt.doc.mapper.DocTagMapper;
 import org.springframework.stereotype.Service;
 import com.jjt.doc.mapper.DocShareMapper;
@@ -110,12 +108,12 @@ public class DocShareServiceImpl implements IDocShareService {
     /**
      * 最近发送文件
      *
-     * @param uid 用户ID
+     * @param docShare
      * @return
      */
     @Override
-    public List<DocShare> selectDocShareSend(Long uid) {
-        return docShareMapper.selectDocShareSend(uid);
+    public List<DocShare> selectDocShareSend(DocShare docShare) {
+        return docShareMapper.selectDocShareSend(docShare);
     }
 
     /**

lzga-modules/lzga-doc/src/main/resources/mapper/doc/DocShareMapper.xml

@@ -52,21 +52,17 @@
         where DOC_ID = #{docId}
     </select>
 
-    <select id="selectDocShareSend" resultType="com.jjt.doc.domain.DocShare">
-        select a.*,
-               b.doc_name,
-               b.doc_type,
-               b.doc_path,
-               b.doc_size,
-               b.doc_desc,
-               b.doc_level,
-               b.create_year docYear,
-               b.owner
-        from doc_share a,
-             doc_info b
-        where a.doc_id = b.doc_id
-          and a.CREATE_BY = #{uid}
-        order by a.update_time desc
+    <select id="selectDocShareSend" parameterType="DocShare" resultType="com.jjt.doc.domain.DocShare">
+        select * from (
+        select a.*, b.doc_name, b.doc_type, b.doc_path,
+        b.doc_size, b.doc_desc, b.doc_level, b.create_year docYear, b.owner
+        from doc_share a,doc_info b where a.doc_id = b.doc_id
+        ) a
+        <where>
+            <if test="docName != null  and docName != ''">and DOC_NAME like concat('%', #{docName}, '%')</if>
+            <if test="createBy != null  and createBy != ''">and CREATE_BY = #{createBy}</if>
+        </where>
+        order by update_time desc
     </select>
     <select id="selectDocShareReceive" parameterType="DocShare" resultType="com.jjt.doc.domain.DocShare">
         select a.*, b.doc_name,