From 9f153a589f3acb6a6769adf423d75e13235bf65a Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Thu, 27 Nov 2025 11:23:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysRoleController.java | 2 ++ .../controller/DocumentScreenController.java | 2 +- .../service/impl/DocumentScreenImpl.java | 21 ++++++++++++------- .../mapper/business/DocumentScreenMapper.xml | 8 ++++++- 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/bonus-base/src/main/java/com/bonus/base/controller/system/SysRoleController.java b/bonus-base/src/main/java/com/bonus/base/controller/system/SysRoleController.java index 20e61e0..e512197 100644 --- a/bonus-base/src/main/java/com/bonus/base/controller/system/SysRoleController.java +++ b/bonus-base/src/main/java/com/bonus/base/controller/system/SysRoleController.java @@ -64,6 +64,8 @@ public class SysRoleController extends BaseController return getDataTable(list); } + + @Log(title = "角色管理", businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('system:role:export')") @PostMapping("/export") diff --git a/bonus-business/src/main/java/com/bonus/business/controller/DocumentScreenController.java b/bonus-business/src/main/java/com/bonus/business/controller/DocumentScreenController.java index 02940d9..976b92e 100644 --- a/bonus-business/src/main/java/com/bonus/business/controller/DocumentScreenController.java +++ b/bonus-business/src/main/java/com/bonus/business/controller/DocumentScreenController.java @@ -154,7 +154,7 @@ public class DocumentScreenController extends BaseController { return result; } } - return AjaxResult.success("工序成功"); + return AjaxResult.success("共享成功"); } /** diff --git a/bonus-business/src/main/java/com/bonus/business/service/impl/DocumentScreenImpl.java b/bonus-business/src/main/java/com/bonus/business/service/impl/DocumentScreenImpl.java index 32c23e2..a6c43fd 100644 --- a/bonus-business/src/main/java/com/bonus/business/service/impl/DocumentScreenImpl.java +++ b/bonus-business/src/main/java/com/bonus/business/service/impl/DocumentScreenImpl.java @@ -239,11 +239,13 @@ public class DocumentScreenImpl implements DocumentScreenService { String repeatType=vo.getRepeatType(); //创建文件 if("userDocument".equals(vo.getParentId())){ - vo.setParentId("0"); vo.setType("3"); } Map map=new HashMap<>(); List list=mapper.getDocumentFileList(vo); + if("userDocument".equals(vo.getParentId())){ + vo.setParentId("0"); + } List fileList=new ArrayList<>(file.length); List delete=new ArrayList<>(); //是否覆盖之前的数据 @@ -610,18 +612,21 @@ public class DocumentScreenImpl implements DocumentScreenService { String userId=SecurityUtils.getUserId().toString(); vo.setUserId(userId); if("1".equals(vo.getType())){ - return AjaxResult.success("当前文件夹没权限共享"); + return AjaxResult.error("当前文件夹没权限共享"); }else{ - if(("2".equals(vo.getType()) || "3".equals(vo.getType())|| "4".equals(vo.getType())) && vo.getParentId().split("_").length==3){ - vo.setParentId(vo.getParentId().split("_")[2]); + if(StringUtils.isNotEmpty(vo.getParentId())){ + if(("2".equals(vo.getType()) || "3".equals(vo.getType())|| "4".equals(vo.getType())) && vo.getParentId().split("_").length==3){ + vo.setParentId(vo.getParentId().split("_")[2]); + } } - if(("2".equals(vo.getType()) || "3".equals(vo.getType())|| "4".equals(vo.getType())) && vo.getNewParentId().split("_").length==3){ - vo.setNewParentId(vo.getNewParentId().split("_")[2]); + if(StringUtils.isNotEmpty(vo.getNewParentId())) { + if (("2".equals(vo.getType()) || "3".equals(vo.getType()) || "4".equals(vo.getType())) && vo.getNewParentId().split("_").length == 3) { + vo.setNewParentId(vo.getNewParentId().split("_")[2]); + } } if(("2".equals(vo.getType()) || "3".equals(vo.getType())|| "4".equals(vo.getType())) && vo.getId().split("_").length==3){ vo.setId(vo.getId().split("_")[2]); } - /* vo.setId(vo.getId().split("_")[2]);*/ TbDocumentFolder documentFolder=new TbDocumentFolder(); String[] ids=vo.getUserIds().split(","); //共享文件夹创建 @@ -640,7 +645,7 @@ public class DocumentScreenImpl implements DocumentScreenService { documentFolder.setPublicFolderId("myShare"); documentFolder.setUserId(userId); documentFolder.setId(vo.getId()); - documentFolder.setAuth(vo.getAuth()); + documentFolder.setAuth("2"); documentFolder.setShareUserId(userId); Integer num= mapper.addDocumentRealUser(documentFolder); if(num!=null && num>0){ diff --git a/bonus-business/src/main/resources/mapper/business/DocumentScreenMapper.xml b/bonus-business/src/main/resources/mapper/business/DocumentScreenMapper.xml index 411d841..4afeeff 100644 --- a/bonus-business/src/main/resources/mapper/business/DocumentScreenMapper.xml +++ b/bonus-business/src/main/resources/mapper/business/DocumentScreenMapper.xml @@ -186,7 +186,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - and pru.public_folder_id=#{parentId} + and pru.public_folder_id=#{parentId} AND folder.create_user=#{createUser} and folder.parent_id=#{parentId} AND folder.create_user=#{createUser} @@ -208,6 +208,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and auth.user_id=#{userId} + + and INSTR(tpf.folder_name,#{keyWord}) > 0 + and tpf.id='0000000'; @@ -227,6 +230,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and INSTR(tudf.folder_name,#{keyWord}) > 0 + + and INSTR(tudf.folder_name,#{keyWord}) > 0 + AND tdfl.lable_id in(