ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(资料中心): 文件夹创建人能看到上传的文件

Browse Source
This commit is contained in:
yjz
2024-02-07 15:43:24 +08:00
parent 6b6e36a891
commit ba912a3309
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/EsInspectFlowController.java
+1
View File
@@ -94,6 +94,7 @@ public class EsInspectFlowController {
@ApiOperation(value="企标稽查流程-流程审批", notes="企标稽查流程-流程审批") @ApiOperation(value="企标稽查流程-流程审批", notes="企标稽查流程-流程审批")
@PostMapping(value = "/flowApproval") @PostMapping(value = "/flowApproval")
public Result<T> flowApproval(@RequestBody EsInspectFlowVO esInspectFlowVO) { public Result<T> flowApproval(@RequestBody EsInspectFlowVO esInspectFlowVO) {
// TODO: 稽查内容回显通过企标制修订创建的稽查内容
esInspectFlowService.flowApproval(esInspectFlowVO); esInspectFlowService.flowApproval(esInspectFlowVO);
return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
} }
laws-modules/src/main/java/com/jero/modules/laws/dataCenter/mapper/xml/LawsDataCenterFileMapper.xml
+2 -1
View File
@@ -43,7 +43,8 @@
uploader, uploader,
(SELECT auth_manage_ids FROM laws_data_center_folder d WHERE d.id = folder_id) auth_manage_ids, (SELECT auth_manage_ids FROM laws_data_center_folder d WHERE d.id = folder_id) auth_manage_ids,
(SELECT auth_view_ids FROM laws_data_center_folder d WHERE d.id = folder_id) auth_view_ids, (SELECT auth_view_ids FROM laws_data_center_folder d WHERE d.id = folder_id) auth_view_ids,
(SELECT default_folder FROM laws_data_center_folder d WHERE d.id = folder_id) default_folder (SELECT default_folder FROM laws_data_center_folder d WHERE d.id = folder_id) default_folder,
(SELECT create_by FROM laws_data_center_folder d WHERE d.id = folder_id) folder_create_by
FROM laws_data_center_file) t FROM laws_data_center_file) t
${ew.customSqlSegment} ${ew.customSqlSegment}
</sql> </sql>
laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java
+9 -4
View File
@@ -83,6 +83,7 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl<LawsDataCenterFil
List<String> adminRoleCodeList = Arrays.asList(adminRoleCode.split(",")); List<String> adminRoleCodeList = Arrays.asList(adminRoleCode.split(","));
Collection<String> intersection = CollectionUtils.intersection(Arrays.asList(CurrentUserUtil.getRoles().split(",")), adminRoleCodeList); Collection<String> intersection = CollectionUtils.intersection(Arrays.asList(CurrentUserUtil.getRoles().split(",")), adminRoleCodeList);
String userId = CurrentUserUtil.getId(); String userId = CurrentUserUtil.getId();
String username = CurrentUserUtil.getUsername();
if (!CurrentUserUtil.getRoles().contains(FieldCommon.ROLE_ADMIN) && CollectionUtils.isEmpty(intersection)) { if (!CurrentUserUtil.getRoles().contains(FieldCommon.ROLE_ADMIN) && CollectionUtils.isEmpty(intersection)) {
queryWrapper.and(qw -> qw queryWrapper.and(qw -> qw
.eq("owner_id", userId) .eq("owner_id", userId)
@@ -90,6 +91,7 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl<LawsDataCenterFil
.or().like("auth_manage_ids", userId) .or().like("auth_manage_ids", userId)
.or().like("push_range_ids", userId) .or().like("push_range_ids", userId)
.or().eq("default_folder", YesOrNoEnum.YES.getValue()) .or().eq("default_folder", YesOrNoEnum.YES.getValue())
.or().eq("folder_create_by", username)
); );
} }
queryWrapper.orderByDesc("create_time"); queryWrapper.orderByDesc("create_time");
@@ -279,13 +281,16 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl<LawsDataCenterFil
QueryWrapper<LawsDataCenterFile> queryWrapper = new QueryWrapper<>(); QueryWrapper<LawsDataCenterFile> queryWrapper = new QueryWrapper<>();
List<String> adminRoleCodeList = Arrays.asList(adminRoleCode.split(",")); List<String> adminRoleCodeList = Arrays.asList(adminRoleCode.split(","));
Collection<String> intersection = CollectionUtils.intersection(Arrays.asList(CurrentUserUtil.getRoles().split(",")), adminRoleCodeList); Collection<String> intersection = CollectionUtils.intersection(Arrays.asList(CurrentUserUtil.getRoles().split(",")), adminRoleCodeList);
String userId = CurrentUserUtil.getId();
String username = CurrentUserUtil.getUsername();
if (!CurrentUserUtil.getRoles().contains(FieldCommon.ROLE_ADMIN) && CollectionUtils.isEmpty(intersection)) { if (!CurrentUserUtil.getRoles().contains(FieldCommon.ROLE_ADMIN) && CollectionUtils.isEmpty(intersection)) {
queryWrapper.and(qw -> qw queryWrapper.and(qw -> qw
.eq("owner_id", CurrentUserUtil.getId()) .eq("owner_id", userId)
.or().like("auth_view_ids", CurrentUserUtil.getId()) .or().like("auth_view_ids", userId)
.or().like("auth_manage_ids", CurrentUserUtil.getId()) .or().like("auth_manage_ids", userId)
.or().like("push_range_ids", CurrentUserUtil.getId()) .or().like("push_range_ids", userId)
.or().eq("default_folder", YesOrNoEnum.YES.getValue()) .or().eq("default_folder", YesOrNoEnum.YES.getValue())
.or().eq("folder_create_by", username)
); );
}else { }else {
return; return;