release-v1.0 #1

Merged
panchichun merged 41 commits from release-v1.0 into main 2024-09-13 17:03:09 +08:00
2 changed files with 2 additions and 1 deletions
Showing only changes of commit 5607c957fb - Show all commits

View File

@ -103,7 +103,7 @@ public class DocumentServiceImpl implements IDocumentService
* @return 请填写功能名称 * @return 请填写功能名称
*/ */
@Override @Override
@DataScope(deptAlias = "sd") @DataScope(deptAlias = "sd", userAlias = "su")
public List<Document> selectDocumentList(Document document) public List<Document> selectDocumentList(Document document)
{ {
if (BooleanUtil.isTrue(document.getPermissionCheck())) { if (BooleanUtil.isTrue(document.getPermissionCheck())) {

View File

@ -40,6 +40,7 @@
from t_document td from t_document td
left join t_tool on t_tool.tool_id = td.tool_id left join t_tool on t_tool.tool_id = td.tool_id
left join sys_dept sd on sd.dept_id = td.doc_resp_dept left join sys_dept sd on sd.dept_id = td.doc_resp_dept
left join sys_user su on td.create_by_id = su.user_id
<where> <where>
<if test="docCode != null and docCode != ''"> and td.doc_code like concat('%', #{docCode}, '%')</if> <if test="docCode != null and docCode != ''"> and td.doc_code like concat('%', #{docCode}, '%')</if>
<if test="docName != null and docName != ''"> and td.doc_name like concat('%', #{docName}, '%')</if> <if test="docName != null and docName != ''"> and td.doc_name like concat('%', #{docName}, '%')</if>