From ba912a33092f53b8ab56db2783b27e2e714d4651 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Wed, 7 Feb 2024 15:43:24 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83):=20?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E5=88=9B=E5=BB=BA=E4=BA=BA=E8=83=BD?= =?UTF-8?q?=E7=9C=8B=E5=88=B0=E4=B8=8A=E4=BC=A0=E7=9A=84=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EsInspectFlowController.java | 1 + .../mapper/xml/LawsDataCenterFileMapper.xml | 3 ++- .../service/impl/LawsDataCenterFileServiceImpl.java | 13 +++++++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/EsInspectFlowController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/EsInspectFlowController.java index dea0f7da..10eb034c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/EsInspectFlowController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/EsInspectFlowController.java @@ -94,6 +94,7 @@ public class EsInspectFlowController { @ApiOperation(value="企标稽查流程-流程审批", notes="企标稽查流程-流程审批") @PostMapping(value = "/flowApproval") public Result flowApproval(@RequestBody EsInspectFlowVO esInspectFlowVO) { + // TODO: 稽查内容回显通过企标制修订创建的稽查内容 esInspectFlowService.flowApproval(esInspectFlowVO); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/mapper/xml/LawsDataCenterFileMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/mapper/xml/LawsDataCenterFileMapper.xml index 5dbf8e75..5610a2b4 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/mapper/xml/LawsDataCenterFileMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/mapper/xml/LawsDataCenterFileMapper.xml @@ -43,7 +43,8 @@ uploader, (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 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 ${ew.customSqlSegment} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java index 38813d97..ed43098f 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java @@ -83,6 +83,7 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl adminRoleCodeList = Arrays.asList(adminRoleCode.split(",")); Collection 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)) { queryWrapper.and(qw -> qw .eq("owner_id", userId) @@ -90,6 +91,7 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); List adminRoleCodeList = Arrays.asList(adminRoleCode.split(",")); Collection 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)) { queryWrapper.and(qw -> qw - .eq("owner_id", CurrentUserUtil.getId()) - .or().like("auth_view_ids", CurrentUserUtil.getId()) - .or().like("auth_manage_ids", CurrentUserUtil.getId()) - .or().like("push_range_ids", CurrentUserUtil.getId()) + .eq("owner_id", userId) + .or().like("auth_view_ids", userId) + .or().like("auth_manage_ids", userId) + .or().like("push_range_ids", userId) .or().eq("default_folder", YesOrNoEnum.YES.getValue()) + .or().eq("folder_create_by", username) ); }else { return;