功能修改

src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java

@@ -15,6 +15,8 @@ import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
@@ -36,6 +38,7 @@ import org.springframework.web.bind.annotation.*;
 import java.io.IOException;
 import java.time.LocalDate;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
@@ -65,7 +68,12 @@ public class MaintenanceController extends BladeController {
     @GetMapping("/plan-page")
     @Operation(summary = "维保计划列表", description = "维保计划列表")
     public R<IPage<MaintenancePlan>> planPage(MaintenancePlan plan, Query query) {
+        BladeUser user = AuthUtil.getUser();
+
         LambdaQueryWrapper<MaintenancePlan> wrapper = Wrappers.lambdaQuery(plan).orderByDesc(MaintenancePlan::getCreateTime);
+        if(!user.getRoleName().contains("administrator") && !user.getRoleName().contains("admin")){
+            wrapper.eq(MaintenancePlan::getDeptId,user.getDeptId());
+        }
         IPage<MaintenancePlan> pages = this.planService.page(Condition.getPage(query), wrapper);
         return R.data(pages);
     }
@@ -116,6 +124,7 @@ public class MaintenanceController extends BladeController {
     @GetMapping("/task-page")
     @Operation(summary = "维保任务列表", description = "维保任务列表")
     public R taskPage(MaintenanceTask task, Query query) {
+        BladeUser user = AuthUtil.getUser();
         LambdaQueryWrapper<MaintenanceTask> wrapper = Wrappers.lambdaQuery(MaintenanceTask.class);
         wrapper.orderByDesc(MaintenanceTask::getStartTime);
         wrapper.eq(MaintenanceTask::getIsDeleted, CommonConstant.FALSE_STR);
@@ -125,6 +134,11 @@ public class MaintenanceController extends BladeController {
         if (Func.isNotEmpty(task.getStatusSearch())) {
             wrapper.in(MaintenanceTask::getTaskStatus, task.getStatusSearch().split(","));
         }
+        if(user.getRoleName().equals("维修人员")){
+            List<String> taskStatusList = Arrays.asList(new String[]{"1","2","3","4"});
+            wrapper.in(MaintenanceTask::getTaskStatus,taskStatusList);
+            wrapper.eq(MaintenanceTask::getServicemanId,user.getUserId());
+        }
         wrapper.like(StringUtils.isNotBlank(task.getDeptName()), MaintenanceTask::getDeptName, task.getDeptName());
         IPage<MaintenanceTask> pages = taskService.page(Condition.getPage(query), wrapper);
         return R.data(pages);
@@ -266,6 +280,9 @@ public class MaintenanceController extends BladeController {
         if (Func.isNotEmpty(task.getStatusSearch())) {
             wrapper.in(MaintenanceTask::getRepairStatus, task.getStatusSearch().split(","));
         }
+        if (Func.isNotEmpty(task.getTaskStatus())) {
+            wrapper.eq(MaintenanceTask::getTaskStatus, task.getTaskStatus());
+        }
         IPage<MaintenanceTask> pages = taskService.page(Condition.getPage(query), wrapper);
         return R.data(pages);
     }