bonus
/
pub_svc_platform_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
haozq 2025-11-27 11:23:04 +08:00
parent c979c62a58
commit 9f153a589f
4 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-base/src/main/java/com/bonus/base/controller/system/SysRoleController.java
View File

@ -64,6 +64,8 @@ public class SysRoleController extends BaseController
return getDataTable(list); return getDataTable(list);
} }
@Log(title = "角色管理", businessType = BusinessType.EXPORT) @Log(title = "角色管理", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:role:export')") @PreAuthorize("@ss.hasPermi('system:role:export')")
@PostMapping("/export") @PostMapping("/export")

2
bonus-business/src/main/java/com/bonus/business/controller/DocumentScreenController.java
View File

@ -154,7 +154,7 @@ public class DocumentScreenController extends BaseController {
return result; return result;
} }
} }
return AjaxResult.success("工序成功"); return AjaxResult.success("共享成功");
} }
/** /**

15
bonus-business/src/main/java/com/bonus/business/service/impl/DocumentScreenImpl.java
View File

@ -239,11 +239,13 @@ public class DocumentScreenImpl implements DocumentScreenService {
String repeatType=vo.getRepeatType(); String repeatType=vo.getRepeatType();
//创建文件 //创建文件
if("userDocument".equals(vo.getParentId())){ if("userDocument".equals(vo.getParentId())){
vo.setParentId("0");
vo.setType("3"); vo.setType("3");
} }
Map<String,TbUserFiles> map=new HashMap<>(); Map<String,TbUserFiles> map=new HashMap<>();
List<TbUserFiles> list=mapper.getDocumentFileList(vo); List<TbUserFiles> list=mapper.getDocumentFileList(vo);
if("userDocument".equals(vo.getParentId())){
vo.setParentId("0");
}
List<MultipartFile> fileList=new ArrayList<>(file.length); List<MultipartFile> fileList=new ArrayList<>(file.length);
List<TbUserFiles> delete=new ArrayList<>(); List<TbUserFiles> delete=new ArrayList<>();
//是否覆盖之前的数据 //是否覆盖之前的数据
@ -610,18 +612,21 @@ public class DocumentScreenImpl implements DocumentScreenService {
String userId=SecurityUtils.getUserId().toString(); String userId=SecurityUtils.getUserId().toString();
vo.setUserId(userId); vo.setUserId(userId);
if("1".equals(vo.getType())){ if("1".equals(vo.getType())){
return AjaxResult.success("当前文件夹没权限共享"); return AjaxResult.error("当前文件夹没权限共享");
}else{ }else{
if(StringUtils.isNotEmpty(vo.getParentId())){
if(("2".equals(vo.getType()) || "3".equals(vo.getType())|| "4".equals(vo.getType())) && vo.getParentId().split("_").length==3){ if(("2".equals(vo.getType()) || "3".equals(vo.getType())|| "4".equals(vo.getType())) && vo.getParentId().split("_").length==3){
vo.setParentId(vo.getParentId().split("_")[2]); vo.setParentId(vo.getParentId().split("_")[2]);
} }
if(("2".equals(vo.getType()) || "3".equals(vo.getType())|| "4".equals(vo.getType())) && vo.getNewParentId().split("_").length==3){ }
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]); vo.setNewParentId(vo.getNewParentId().split("_")[2]);
} }
}
if(("2".equals(vo.getType()) || "3".equals(vo.getType())|| "4".equals(vo.getType())) && vo.getId().split("_").length==3){ 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]);
} }
/* vo.setId(vo.getId().split("_")[2]);*/
TbDocumentFolder documentFolder=new TbDocumentFolder(); TbDocumentFolder documentFolder=new TbDocumentFolder();
String[] ids=vo.getUserIds().split(","); String[] ids=vo.getUserIds().split(",");
//共享文件夹创建 //共享文件夹创建
@ -640,7 +645,7 @@ public class DocumentScreenImpl implements DocumentScreenService {
documentFolder.setPublicFolderId("myShare"); documentFolder.setPublicFolderId("myShare");
documentFolder.setUserId(userId); documentFolder.setUserId(userId);
documentFolder.setId(vo.getId()); documentFolder.setId(vo.getId());
documentFolder.setAuth(vo.getAuth()); documentFolder.setAuth("2");
documentFolder.setShareUserId(userId); documentFolder.setShareUserId(userId);
Integer num= mapper.addDocumentRealUser(documentFolder); Integer num= mapper.addDocumentRealUser(documentFolder);
if(num!=null && num>0){ if(num!=null && num>0){

8
bonus-business/src/main/resources/mapper/business/DocumentScreenMapper.xml
View File

@ -186,7 +186,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if> </if>
<if test='type=="3" or type==3 '> <if test='type=="3" or type==3 '>
<if test="parentId=='userDocument'"> <if test="parentId=='userDocument'">
and pru.public_folder_id=#{parentId} and pru.public_folder_id=#{parentId} AND folder.create_user=#{createUser}
</if> </if>
<if test="parentId!='userDocument'"> <if test="parentId!='userDocument'">
and folder.parent_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"
<if test='isAdmin!="1" '> <if test='isAdmin!="1" '>
and auth.user_id=#{userId} and auth.user_id=#{userId}
</if> </if>
<if test='keyWord!=null'>
and INSTR(tpf.folder_name,#{keyWord}) > 0
</if>
<if test="labelIds!=null and labelIds!=''"> <if test="labelIds!=null and labelIds!=''">
and tpf.id='0000000'; and tpf.id='0000000';
</if> </if>
@ -227,6 +230,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test='keyWord!=null'> <if test='keyWord!=null'>
and INSTR(tudf.folder_name,#{keyWord}) > 0 and INSTR(tudf.folder_name,#{keyWord}) > 0
</if> </if>
<if test='keyWord!=null'>
and INSTR(tudf.folder_name,#{keyWord}) > 0
</if>
<if test="labelIds!=null and labelIds!=''"> <if test="labelIds!=null and labelIds!=''">
AND tdfl.lable_id in( AND tdfl.lable_id in(
<foreach collection="labelIdList" item="item" separator=","> <foreach collection="labelIdList" item="item" separator=",">