增加部门显示和按部门查询

lzga-modules/lzga-doc/src/main/java/com/jjt/doc/domain/DocInfo.java

@@ -3,10 +3,10 @@ package com.jjt.doc.domain;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.jjt.common.core.annotation.Excel;
 import com.jjt.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.util.List;
 
@@ -103,6 +103,16 @@ public class DocInfo extends BaseEntity {
     @TableField(exist = false)
     private Long dirId;
 
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     public List<DocTag> getTagList() {
         return tagList;
     }

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

@@ -16,6 +16,7 @@
         <result property="allowEdit" column="ALLOW_EDIT"/>
         <result property="docOf" column="DOC_OF"/>
         <result property="owner" column="OWNER"/>
+        <result property="deptName" column="DEPT_NAME"/>
         <result property="createYear" column="CREATE_YEAR"/>
         <result property="createBy" column="CREATE_BY"/>
         <result property="createTime" column="CREATE_TIME"/>
@@ -73,7 +74,8 @@
 
     <select id="selectDocInfoListDir" parameterType="DocInfo" resultMap="DocInfoResult">
         select A.DOC_ID, DOC_NAME, DOC_TYPE, DOC_SIZE, CLASSIFY_ID, DOC_DESC, DOC_PATH, DOC_LEVEL, ALLOW_EDIT, DOC_OF,
-        OWNER, CREATE_YEAR, CREATE_BY, CREATE_TIME, UPDATE_BY, UPDATE_TIME, REMARK, IS_DEL
+        OWNER, CREATE_YEAR, CREATE_BY, CREATE_TIME, UPDATE_BY, UPDATE_TIME, REMARK, IS_DEL,(SELECT DEPT_NAME FROM
+        SYS_DEPT WHERE DEPT_ID=(SELECT DEPT_ID FROM SYS_USER WHERE USER_ID=A.OWNER)) DEPT_NAME
         from doc_info a,(
         select DOC_ID,DOC_YEAR from DOC_INFO_DIR where dir_id in
         (
@@ -100,6 +102,11 @@
             <if test="updateTime != null ">and UPDATE_TIME = #{updateTime}</if>
             <if test="remark != null  and remark != ''">and REMARK = #{remark}</if>
             <if test="isDel != null  and isDel != ''">and IS_DEL = #{isDel}</if>
+            <if test="deptName != null  and deptName != ''">
+                and a.owner in (select user_id from sys_user where dept_id in(
+                select dept_id from sys_dept where dept_name like concat('%', #{deptName}, '%')
+                ))
+            </if>
             <if test="params.tagId!=null and params.tagId!=''">and a.doc_id in(select doc_id from DOC_TAG_RELA where
                 tag_id=#{params.tagId})
             </if>
@@ -192,4 +199,4 @@
             #{docId}
         </foreach>
     </delete>
-</mapper>
+</mapper>