From 85c49116df667af1a9b64013cf868441919692bc Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Thu, 18 Jan 2024 09:42:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=98=89=E7=A6=BE=E4=BA=8C=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/InspectionTaskController.java | 11 +-------- .../controller/MaintainTaskController.java | 14 ----------- .../impl/InspectionPointServiceImpl.java | 13 ++++++++--- .../impl/InspectionTaskServiceImpl.java | 23 ++++++++++++++++--- .../service/impl/MaintainPlanServiceImpl.java | 2 +- .../service/impl/MaintainTaskServiceImpl.java | 23 +++++++++++++++++-- 6 files changed, 53 insertions(+), 33 deletions(-) diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/InspectionTaskController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/InspectionTaskController.java index cc575ce..30ca1c0 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/InspectionTaskController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/InspectionTaskController.java @@ -31,16 +31,7 @@ public class InspectionTaskController extends BladeController { @GetMapping("/page") public R page(InspectionTask entry, Query query) { - List roles = Arrays.asList(AuthUtil.getUserRole().split(",")); - if(!roles.contains("admin") && !roles.contains("政府")){ - if(roles.contains("巡检管理")){ - entry.setCreateDept(Long.parseLong(AuthUtil.getDeptId())); - } - if(roles.contains("巡检人员")){ - List groupIdList = Arrays.asList(AuthUtil.getDeptId().split(",")); - entry.setGroupIdList(groupIdList); - } - } + return R.data(service.findPage(entry, query)); } diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/MaintainTaskController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/MaintainTaskController.java index 289625f..bc9e6e4 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/MaintainTaskController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/MaintainTaskController.java @@ -7,15 +7,11 @@ import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.mp.support.Query; -import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.lims.entry.MaintainTask; import org.springblade.lims.service.IMaintainTaskService; import org.springframework.web.bind.annotation.*; -import java.util.Arrays; -import java.util.List; - /** * @author sjx @@ -31,16 +27,6 @@ public class MaintainTaskController extends BladeController { @GetMapping("/page") public R page(MaintainTask entry, Query query) { - List roles = Arrays.asList(AuthUtil.getUserRole().split(",")); - if(!roles.contains("admin") && !roles.contains("政府")){ - if(roles.contains("保养管理")){ - entry.setCreateDept(Long.parseLong(AuthUtil.getDeptId())); - } - if(roles.contains("保养人员")){ - List groupIdList = Arrays.asList(AuthUtil.getDeptId().split(",")); - entry.setGroupIdList(groupIdList); - } - } return R.data(service.findPage(entry, query)); } diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/InspectionPointServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/InspectionPointServiceImpl.java index 3bb9e3c..9b9d371 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/InspectionPointServiceImpl.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/InspectionPointServiceImpl.java @@ -15,6 +15,7 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.core.tool.utils.StringUtil; import org.springblade.lims.entry.*; import org.springblade.lims.mapper.InspectionPointMapper; @@ -72,9 +73,15 @@ public class InspectionPointServiceImpl extends BaseServiceImpl itemList = inspectionPointItemService.list(new LambdaQueryWrapper().eq(InspectionPointItem::getPointId,point.getId())); if(CollectionUtils.isNotEmpty(itemList)){ point.setItemSize(itemList.size()); diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/InspectionTaskServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/InspectionTaskServiceImpl.java index ac8fa96..afad953 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/InspectionTaskServiceImpl.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/InspectionTaskServiceImpl.java @@ -21,10 +21,13 @@ import org.springblade.core.tool.utils.StringUtil; import org.springblade.lims.entry.*; import org.springblade.lims.mapper.InspectionTaskMapper; import org.springblade.lims.service.*; +import org.springblade.system.cache.SysCache; +import org.springblade.system.entity.Dept; import org.springblade.system.feign.ISysClient; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.List; @@ -78,10 +81,24 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl roles = Arrays.asList(AuthUtil.getUserRole().split(",")); + if(!roles.contains("admin") && !roles.contains("政府")){ + /*if(roles.contains("巡检管理")){ + entry.setCreateDept(Long.parseLong(AuthUtil.getDeptId())); + }*/ + if(roles.contains("巡检人员")){ + List groupIdList = Arrays.asList(AuthUtil.getDeptId().split(",")); + entry.setGroupIdList(groupIdList); + }else{ + List deptIds = new ArrayList<>(); + List depts = SysCache.getDeptChild(Long.parseLong(AuthUtil.getDeptId())); + if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(depts)){ + deptIds = depts.stream().map(Dept::getId).collect(Collectors.toList()); + } + deptIds.add(Long.parseLong(AuthUtil.getDeptId())); + wrapper.in(BaseEntity::getCreateDept,deptIds); + } } - wrapper.eq(BaseEntity::getIsDeleted,0); wrapper.orderByDesc(InspectionTask::getCreateTime); IPage page = this.page(Condition.getPage(query), wrapper); diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/MaintainPlanServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/MaintainPlanServiceImpl.java index 6a5deb2..5ad6661 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/MaintainPlanServiceImpl.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/MaintainPlanServiceImpl.java @@ -60,7 +60,7 @@ public class MaintainPlanServiceImpl extends BaseServiceImpl roles = Arrays.asList(AuthUtil.getUserRole().split(",")); + if(!roles.contains("admin") && !roles.contains("政府")){ + /*if(roles.contains("保养管理")){ + entry.setCreateDept(Long.parseLong(AuthUtil.getDeptId())); + }*/ + if(roles.contains("保养人员")){ + List groupIdList = Arrays.asList(AuthUtil.getDeptId().split(",")); + entry.setGroupIdList(groupIdList); + }else{ + List deptIds = new ArrayList<>(); + List depts = SysCache.getDeptChild(Long.parseLong(AuthUtil.getDeptId())); + if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(depts)){ + deptIds = depts.stream().map(Dept::getId).collect(Collectors.toList()); + } + deptIds.add(Long.parseLong(AuthUtil.getDeptId())); + wrapper.in(BaseEntity::getCreateDept,deptIds); + } } wrapper.eq(BaseEntity::getIsDeleted,0);